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

Commit 516f2931 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.332 into android-4.9-q 



Changes in 4.9.332
	ocfs2: clear dinode links count in case of error
	ocfs2: fix BUG when iput after ocfs2_mknod fails
	ata: ahci-imx: Fix MODULE_ALIAS
	ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS
	arm64: errata: Remove AES hwcap for COMPAT tasks
	HID: magicmouse: Do not set BTN_MOUSE on double report
	net/atm: fix proc_mpc_write incorrect return value
	net: hns: fix possible memory leak in hnae_ae_register()
	ACPI: video: Force backlight native for more TongFang devices
	ALSA: Use del_timer_sync() before freeing timer
	ALSA: au88x0: use explicitly signed char
	USB: add RESET_RESUME quirk for NVIDIA Jetson devices in RCM
	usb: bdc: change state when port disconnected
	xhci: Remove device endpoints from bandwidth list when freeing the device
	tools: iio: iio_utils: fix digit calculation
	fbdev: smscufx: Fix several use-after-free bugs
	mac802154: Fix LQI recording
	drm/msm/hdmi: fix memory corruption with too many bridges
	mmc: core: Fix kernel panic when remove non-standard SDIO card
	kernfs: fix use-after-free in __kernfs_remove
	s390/futex: add missing EX_TABLE entry to __futex_atomic_op()
	Xen/gntdev: don't ignore kernel unmapping error
	xen/gntdev: Prevent leaking grants
	mm,hugetlb: take hugetlb_lock before decrementing h->resv_huge_pages
	net: ieee802154: fix error return code in dgram_bind()
	drm/msm: Fix return type of mdp4_lvds_connector_mode_valid
	arc: iounmap() arg is volatile
	ALSA: ac97: fix possible memory leak in snd_ac97_dev_register()
	kcm: annotate data-races around kcm->rx_psock
	kcm: annotate data-races around kcm->rx_wait
	net: lantiq_etop: don't free skb when returning NETDEV_TX_BUSY
	tcp: fix indefinite deferral of RTO with SACK reneging
	can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path
	media: vivid: s_fbuf: add more sanity checks
	media: vivid: dev->bitmap_cap wasn't freed in all cases
	media: v4l2-dv-timings: add sanity checks for blanking values
	media: videodev2.h: V4L2_DV_BT_BLANKING_HEIGHT should check 'interlaced'
	i40e: Fix ethtool rx-flow-hash setting for X722
	net: ksz884x: fix missing pci_disable_device() on error in pcidev_init()
	ALSA: aoa: i2sbus: fix possible memory leak in i2sbus_add_dev()
	ALSA: aoa: Fix I2S device accounting
	openvswitch: switch from WARN to pr_warn
	net: ehea: fix possible memory leak in ehea_register_port()
	can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive
	Linux 4.9.332

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I34f534c6b1ba325afd8991a2731dab1bac206c0c
parents 9b95cf46 69c28067

Documentation/arm64/silicon-errata.txt

+2 −0
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ stable kernels. 
| ARM            | Cortex-A57      | #832075         | ARM64_ERRATUM_832075        |

| ARM            | Cortex-A57      | #852523         | N/A                         |

| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220        |

| ARM            | Cortex-A57      | #1742098        | ARM64_ERRATUM_1742098       |

| ARM            | Cortex-A72      | #853709         | N/A                         |

| ARM            | Cortex-A72      | #1655431        | ARM64_ERRATUM_1742098       |

| ARM            | Cortex-A55      | #1024718        | ARM64_ERRATUM_1024718       |

| ARM            | Cortex-A76      | #1188873        | ARM64_ERRATUM_1188873       |

| ARM            | MMU-500         | #841119,#826419 | N/A                         |

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 9

SUBLEVEL = 331

SUBLEVEL = 332

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void ioport_unmap(void __iomem *addr) 
{

}



extern void iounmap(const void __iomem *addr);

extern void iounmap(const volatile void __iomem *addr);



#define ioremap_nocache(phy, sz)	ioremap(phy, sz)

#define ioremap_wc(phy, sz)		ioremap(phy, sz)

arch/arc/mm/ioremap.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void __iomem *ioremap_prot(phys_addr_t paddr, unsigned long size, 
EXPORT_SYMBOL(ioremap_prot);





void iounmap(const void __iomem *addr)

void iounmap(const volatile void __iomem *addr)

{

	/* weird double cast to handle phys_addr_t > 32 bits */

	if (arc_uncached_addr_space((phys_addr_t)(u32)addr))

arch/arm64/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -457,6 +457,22 @@ config ARM64_ERRATUM_1188873 


	  If unsure, say Y.



config ARM64_ERRATUM_1742098

	bool "Cortex-A57/A72: 1742098: ELR recorded incorrectly on interrupt taken between cryptographic instructions in a sequence"

	depends on COMPAT

	default y

	help

	  This option removes the AES hwcap for aarch32 user-space to

	  workaround erratum 1742098 on Cortex-A57 and Cortex-A72.



	  Affected parts may corrupt the AES state if an interrupt is

	  taken between a pair of AES instructions. These instructions

	  are only present if the cryptography extensions are present.

	  All software should have a fallback implementation for CPUs

	  that don't implement the cryptography extensions.



	  If unsure, say Y.



config CAVIUM_ERRATUM_22375

	bool "Cavium erratum 22375, 24313"

	default y