Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e962a34 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14.44 into android-4.14



Changes in 4.14.44
	net: Fix a bug in removing queues from XPS map
	net/mlx4_core: Fix error handling in mlx4_init_port_info.
	net/sched: fix refcnt leak in the error path of tcf_vlan_init()
	net: sched: red: avoid hashing NULL child
	net/smc: check for missing nlattrs in SMC_PNETID messages
	net: test tailroom before appending to linear skb
	packet: in packet_snd start writing at link layer allocation
	sock_diag: fix use-after-free read in __sk_free
	tcp: purge write queue in tcp_connect_init()
	vmxnet3: set the DMA mask before the first DMA map operation
	vmxnet3: use DMA memory barriers where required
	hv_netvsc: Fix the real number of queues of non-vRSS cases
	hv_netvsc: Rename ind_table to rx_table
	hv_netvsc: Rename tx_send_table to tx_table
	hv_netvsc: Add initialization of tx_table in netvsc_device_add()
	hv_netvsc: Set tx_table to equal weight after subchannels open
	hv_netvsc: netvsc_teardown_gpadl() split
	hv_netvsc: preserve hw_features on mtu/channels/ringparam changes
	hv_netvsc: empty current transmit aggregation if flow blocked
	hv_netvsc: Use the num_online_cpus() for channel limit
	hv_netvsc: avoid retry on send during shutdown
	hv_netvsc: only wake transmit queue if link is up
	hv_netvsc: fix error unwind handling if vmbus_open fails
	hv_netvsc: cancel subchannel setup before halting device
	hv_netvsc: fix race in napi poll when rescheduling
	hv_netvsc: defer queue selection to VF
	hv_netvsc: disable NAPI before channel close
	hv_netvsc: use RCU to fix concurrent rx and queue changes
	hv_netvsc: change GPAD teardown order on older versions
	hv_netvsc: common detach logic
	hv_netvsc: Use Windows version instead of NVSP version on GPAD teardown
	hv_netvsc: Split netvsc_revoke_buf() and netvsc_teardown_gpadl()
	hv_netvsc: Ensure correct teardown message sequence order
	hv_netvsc: Fix net device attach on older Windows hosts
	sparc: vio: use put_device() instead of kfree()
	ext2: fix a block leak
	s390: add assembler macros for CPU alternatives
	s390: move expoline assembler macros to a header
	s390/crc32-vx: use expoline for indirect branches
	s390/lib: use expoline for indirect branches
	s390/ftrace: use expoline for indirect branches
	s390/kernel: use expoline for indirect branches
	s390: move spectre sysfs attribute code
	s390: extend expoline to BC instructions
	s390: use expoline thunks in the BPF JIT
	scsi: libsas: defer ata device eh commands to libata
	scsi: sg: allocate with __GFP_ZERO in sg_build_indirect()
	scsi: zfcp: fix infinite iteration on ERP ready list
	loop: don't call into filesystem while holding lo_ctl_mutex
	loop: fix LOOP_GET_STATUS lock imbalance
	cfg80211: limit wiphy names to 128 bytes
	hfsplus: stop workqueue when fill_super() failed
	x86/kexec: Avoid double free_page() upon do_kexec_load() failure
	usb: gadget: f_uac2: fix bFirstInterface in composite gadget
	usb: dwc3: Undo PHY init if soft reset fails
	usb: dwc3: omap: don't miss events during suspend/resume
	usb: gadget: core: Fix use-after-free of usb_request
	usb: gadget: fsl_udc_core: fix ep valid checks
	usb: dwc2: Fix dwc2_hsotg_core_init_disconnected()
	usb: cdc_acm: prevent race at write to acm while system resumes
	net: usbnet: fix potential deadlock on 32bit hosts
	ARM: dts: imx7d-sdb: Fix regulator-usb-otg2-vbus node name
	usb: host: xhci-plat: revert "usb: host: xhci-plat: enable clk in resume timing"
	USB: OHCI: Fix NULL dereference in HCDs using HCD_LOCAL_MEM
	net/usb/qmi_wwan.c: Add USB id for lt4120 modem
	net-usb: add qmi_wwan if on lte modem wistron neweb d18q1
	Bluetooth: btusb: Add USB ID 7392:a611 for Edimax EW-7611ULB
	ALSA: usb-audio: Add native DSD support for Luxman DA-06
	usb: dwc3: Add SoftReset PHY synchonization delay
	usb: dwc3: Update DWC_usb31 GTXFIFOSIZ reg fields
	usb: dwc3: Makefile: fix link error on randconfig
	xhci: zero usb device slot_id member when disabling and freeing a xhci slot
	usb: dwc2: Fix interval type issue
	usb: dwc2: hcd: Fix host channel halt flow
	usb: dwc2: host: Fix transaction errors in host mode
	usb: gadget: ffs: Let setup() return USB_GADGET_DELAYED_STATUS
	usb: gadget: ffs: Execute copy_to_user() with USER_DS set
	usbip: Correct maximum value of CONFIG_USBIP_VHCI_HC_PORTS
	usb: gadget: udc: change comparison to bitshift when dealing with a mask
	usb: gadget: composite: fix incorrect handling of OS desc requests
	media: lgdt3306a: Fix module count mismatch on usb unplug
	media: em28xx: USB bulk packet size fix
	Bluetooth: btusb: Add device ID for RTL8822BE
	xhci: Show what USB release number the xHC supports from protocol capablity
	staging: bcm2835-audio: Release resources on module_exit()
	staging: lustre: fix bug in osc_enter_cache_try
	staging: fsl-dpaa2/eth: Fix incorrect casts
	staging: rtl8192u: return -ENOMEM on failed allocation of priv->oldaddr
	staging: ks7010: Use constants from ieee80211_eid instead of literal ints.
	staging: lustre: lmv: correctly iput lmo_root
	crypto: inside-secure - wait for the request to complete if in the backlog
	crypto: atmel-aes - fix the keys zeroing on errors
	crypto: ccp - don't disable interrupts while setting up debugfs
	crypto: inside-secure - do not process request if no command was issued
	crypto: inside-secure - fix the cache_len computation
	crypto: inside-secure - fix the extra cache computation
	crypto: sunxi-ss - Add MODULE_ALIAS to sun4i-ss
	crypto: inside-secure - fix the invalidation step during cra_exit
	scsi: mpt3sas: fix an out of bound write
	scsi: qla2xxx: Fix memory corruption during hba reset test
	scsi: ufs: Enable quirk to ignore sending WRITE_SAME command
	scsi: bnx2fc: Fix check in SCSI completion handler for timed out request
	scsi: sym53c8xx_2: iterator underflow in sym_getsync()
	scsi: mptfusion: Add bounds check in mptctl_hp_targetinfo()
	scsi: qla2xxx: Avoid triggering undefined behavior in qla2x00_mbx_completion()
	scsi: storvsc: Increase cmd_per_lun for higher speed devices
	scsi: qedi: Fix truncation of CHAP name and secret
	scsi: aacraid: fix shutdown crash when init fails
	scsi: qla4xxx: skip error recovery in case of register disconnect.
	scsi: qedi: Fix kernel crash during port toggle
	scsi: mpt3sas: Do not mark fw_event workqueue as WQ_MEM_RECLAIM
	scsi: sd: Keep disk read-only when re-reading partition
	scsi: iscsi_tcp: set BDI_CAP_STABLE_WRITES when data digest enabled
	scsi: aacraid: Insure command thread is not recursively stopped
	scsi: core: Make SCSI Status CONDITION MET equivalent to GOOD
	scsi: mvsas: fix wrong endianness of sgpio api
	scsi: lpfc: Fix issue_lip if link is disabled
	scsi: lpfc: Fix soft lockup in lpfc worker thread during LIP testing
	scsi: lpfc: Fix frequency of Release WQE CQEs
	ASoC: hdmi-codec: Fix module unloading caused kernel crash
	ASoC: rockchip: rk3288-hdmi-analog: Select needed codecs
	ASoC: samsung: odroid: Fix 32000 sample rate handling
	ASoC: topology: create TLV data for dapm widgets
	ASoC: samsung: i2s: Ensure the RCLK rate is properly determined
	clk: rockchip: Fix wrong parent for SDMMC phase clock for rk3228
	clk: Don't show the incorrect clock phase
	clk: hisilicon: mark wdt_mux_p[] as const
	clk: tegra: Fix pll_u rate configuration
	clk: rockchip: Prevent calculating mmc phase if clock rate is zero
	clk: samsung: s3c2410: Fix PLL rates
	clk: samsung: exynos7: Fix PLL rates
	clk: samsung: exynos5260: Fix PLL rates
	clk: samsung: exynos5433: Fix PLL rates
	clk: samsung: exynos5250: Fix PLL rates
	clk: samsung: exynos3250: Fix PLL rates
	media: dmxdev: fix error code for invalid ioctls
	media: Don't let tvp5150_get_vbi() go out of vbi_ram_default array
	media: ov5645: add missing of_node_put() in error path
	media: cx23885: Override 888 ImpactVCBe crystal frequency
	media: cx23885: Set subdev host data to clk_freq pointer
	media: s3c-camif: fix out-of-bounds array access
	media: lgdt3306a: Fix a double kfree on i2c device remove
	media: em28xx: Add Hauppauge SoloHD/DualHD bulk models
	media: v4l: vsp1: Fix display stalls when requesting too many inputs
	media: i2c: adv748x: fix HDMI field heights
	media: vb2: Fix videobuf2 to map correct area
	media: vivid: fix incorrect capabilities for radio
	media: cx25821: prevent out-of-bounds read on array card
	serial: xuartps: Fix out-of-bounds access through DT alias
	serial: sh-sci: Fix out-of-bounds access through DT alias
	serial: samsung: Fix out-of-bounds access through serial port index
	serial: mxs-auart: Fix out-of-bounds access through serial port index
	serial: imx: Fix out-of-bounds access through serial port index
	serial: fsl_lpuart: Fix out-of-bounds access through DT alias
	serial: arc_uart: Fix out-of-bounds access through DT alias
	serial: 8250: Don't service RX FIFO if interrupts are disabled
	serial: altera: ensure port->regshift is honored consistently
	rtc: snvs: Fix usage of snvs_rtc_enable
	rtc: hctosys: Ensure system time doesn't overflow time_t
	rtc: rk808: fix possible race condition
	rtc: m41t80: fix race conditions
	rtc: tx4939: avoid unintended sign extension on a 24 bit shift
	rtc: rp5c01: fix possible race condition
	rtc: goldfish: Add missing MODULE_LICENSE
	Linux 4.14.44

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6d4fa70c 102b97d6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
VERSION = 4
PATCHLEVEL = 14
SUBLEVEL = 43
SUBLEVEL = 44
EXTRAVERSION =
NAME = Petit Gorille

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@
		enable-active-high;
	};

	reg_usb_otg2_vbus: regulator-usb-otg1-vbus {
	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
		compatible = "regulator-fixed";
		regulator-name = "usb_otg2_vbus";
		regulator-min-microvolt = <5000000>;
+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@
 */

#include <linux/linkage.h>
#include <asm/nospec-insn.h>
#include <asm/vx-insn.h>

/* Vector register range containing CRC-32 constants */
@@ -67,6 +68,8 @@

.previous

	GEN_BR_THUNK %r14

.text
/*
 * The CRC-32 function(s) use these calling conventions:
@@ -203,6 +206,6 @@ ENTRY(crc32_be_vgfm_16)

.Ldone:
	VLGVF	%r2,%v2,3
	br	%r14
	BR_EX	%r14

.previous
+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@
 */

#include <linux/linkage.h>
#include <asm/nospec-insn.h>
#include <asm/vx-insn.h>

/* Vector register range containing CRC-32 constants */
@@ -76,6 +77,7 @@

.previous

	GEN_BR_THUNK %r14

.text

@@ -264,6 +266,6 @@ crc32_le_vgfm_generic:

.Ldone:
	VLGVF	%r2,%v2,2
	br	%r14
	BR_EX	%r14

.previous
+108 −0
Original line number Diff line number Diff line
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_S390_ALTERNATIVE_ASM_H
#define _ASM_S390_ALTERNATIVE_ASM_H

#ifdef __ASSEMBLY__

/*
 * Check the length of an instruction sequence. The length may not be larger
 * than 254 bytes and it has to be divisible by 2.
 */
.macro alt_len_check start,end
	.if ( \end - \start ) > 254
	.error "cpu alternatives does not support instructions blocks > 254 bytes\n"
	.endif
	.if ( \end - \start ) % 2
	.error "cpu alternatives instructions length is odd\n"
	.endif
.endm

/*
 * Issue one struct alt_instr descriptor entry (need to put it into
 * the section .altinstructions, see below). This entry contains
 * enough information for the alternatives patching code to patch an
 * instruction. See apply_alternatives().
 */
.macro alt_entry orig_start, orig_end, alt_start, alt_end, feature
	.long	\orig_start - .
	.long	\alt_start - .
	.word	\feature
	.byte	\orig_end - \orig_start
	.byte	\alt_end - \alt_start
.endm

/*
 * Fill up @bytes with nops. The macro emits 6-byte nop instructions
 * for the bulk of the area, possibly followed by a 4-byte and/or
 * a 2-byte nop if the size of the area is not divisible by 6.
 */
.macro alt_pad_fill bytes
	.fill	( \bytes ) / 6, 6, 0xc0040000
	.fill	( \bytes ) % 6 / 4, 4, 0x47000000
	.fill	( \bytes ) % 6 % 4 / 2, 2, 0x0700
.endm

/*
 * Fill up @bytes with nops. If the number of bytes is larger
 * than 6, emit a jg instruction to branch over all nops, then
 * fill an area of size (@bytes - 6) with nop instructions.
 */
.macro alt_pad bytes
	.if ( \bytes > 0 )
	.if ( \bytes > 6 )
	jg	. + \bytes
	alt_pad_fill \bytes - 6
	.else
	alt_pad_fill \bytes
	.endif
	.endif
.endm

/*
 * Define an alternative between two instructions. If @feature is
 * present, early code in apply_alternatives() replaces @oldinstr with
 * @newinstr. ".skip" directive takes care of proper instruction padding
 * in case @newinstr is longer than @oldinstr.
 */
.macro ALTERNATIVE oldinstr, newinstr, feature
	.pushsection .altinstr_replacement,"ax"
770:	\newinstr
771:	.popsection
772:	\oldinstr
773:	alt_len_check 770b, 771b
	alt_len_check 772b, 773b
	alt_pad ( ( 771b - 770b ) - ( 773b - 772b ) )
774:	.pushsection .altinstructions,"a"
	alt_entry 772b, 774b, 770b, 771b, \feature
	.popsection
.endm

/*
 * Define an alternative between two instructions. If @feature is
 * present, early code in apply_alternatives() replaces @oldinstr with
 * @newinstr. ".skip" directive takes care of proper instruction padding
 * in case @newinstr is longer than @oldinstr.
 */
.macro ALTERNATIVE_2 oldinstr, newinstr1, feature1, newinstr2, feature2
	.pushsection .altinstr_replacement,"ax"
770:	\newinstr1
771:	\newinstr2
772:	.popsection
773:	\oldinstr
774:	alt_len_check 770b, 771b
	alt_len_check 771b, 772b
	alt_len_check 773b, 774b
	.if ( 771b - 770b > 772b - 771b )
	alt_pad ( ( 771b - 770b ) - ( 774b - 773b ) )
	.else
	alt_pad ( ( 772b - 771b ) - ( 774b - 773b ) )
	.endif
775:	.pushsection .altinstructions,"a"
	alt_entry 773b, 775b, 770b, 771b,\feature1
	alt_entry 773b, 775b, 771b, 772b,\feature2
	.popsection
.endm

#endif	/*  __ASSEMBLY__  */

#endif /* _ASM_S390_ALTERNATIVE_ASM_H */
Loading