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

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

Merge 4.14.148 into android-4.14-q 



Changes in 4.14.148
	tpm: migrate pubek_show to struct tpm_buf
	tpm: use tpm_try_get_ops() in tpm-sysfs.c.
	tpm: Fix TPM 1.2 Shutdown sequence to prevent future TPM operations
	drm/bridge: tc358767: Increase AUX transfer length limit
	drm/panel: simple: fix AUO g185han01 horizontal blanking
	video: ssd1307fb: Start page range at page_offset
	drm/stm: attach gem fence to atomic state
	drm/radeon: Fix EEH during kexec
	gpu: drm: radeon: Fix a possible null-pointer dereference in radeon_connector_set_property()
	ipmi_si: Only schedule continuously in the thread in maintenance mode
	clk: qoriq: Fix -Wunused-const-variable
	clk: sunxi-ng: v3s: add missing clock slices for MMC2 module clocks
	clk: sirf: Don't reference clk_init_data after registration
	clk: zx296718: Don't reference clk_init_data after registration
	powerpc/xmon: Check for HV mode when dumping XIVE info from OPAL
	powerpc/rtas: use device model APIs and serialization during LPM
	powerpc/futex: Fix warning: 'oldval' may be used uninitialized in this function
	powerpc/pseries/mobility: use cond_resched when updating device tree
	pinctrl: tegra: Fix write barrier placement in pmx_writel
	vfio_pci: Restore original state on release
	drm/nouveau/volt: Fix for some cards having 0 maximum voltage
	drm/amdgpu/si: fix ASIC tests
	powerpc/64s/exception: machine check use correct cfar for late handler
	powerpc/pseries: correctly track irq state in default idle
	arm64: fix unreachable code issue with cmpxchg
	clk: at91: select parent if main oscillator or bypass is enabled
	scsi: core: Reduce memory required for SCSI logging
	dma-buf/sw_sync: Synchronize signal vs syncpt free
	MIPS: tlbex: Explicitly cast _PAGE_NO_EXEC to a boolean
	i2c-cht-wc: Fix lockdep warning
	mfd: intel-lpss: Remove D3cold delay
	PCI: tegra: Fix OF node reference leak
	livepatch: Nullify obj->mod in klp_module_coming()'s error path
	ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes
	rtc: snvs: fix possible race condition
	HID: apple: Fix stuck function keys when using FN
	PCI: rockchip: Propagate errors for optional regulators
	PCI: imx6: Propagate errors for optional regulators
	PCI: exynos: Propagate errors for optional PHYs
	security: smack: Fix possible null-pointer dereferences in smack_socket_sock_rcv_skb()
	ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address
	fat: work around race with userspace's read via blockdev while mounting
	pktcdvd: remove warning on attempting to register non-passthrough dev
	hypfs: Fix error number left in struct pointer member
	kbuild: clean compressed initramfs image
	ocfs2: wait for recovering done after direct unlock request
	kmemleak: increase DEBUG_KMEMLEAK_EARLY_LOG_SIZE default to 16K
	bpf: fix use after free in prog symbol exposure
	cxgb4:Fix out-of-bounds MSI-X info array access
	erspan: remove the incorrect mtu limit for erspan
	hso: fix NULL-deref on tty open
	ipv6: drop incoming packets having a v4mapped source address
	net: ipv4: avoid mixed n_redirects and rate_tokens usage
	net: qlogic: Fix memory leak in ql_alloc_large_buffers
	net: Unpublish sk from sk_reuseport_cb before call_rcu
	nfc: fix memory leak in llcp_sock_bind()
	qmi_wwan: add support for Cinterion CLS8 devices
	sch_dsmark: fix potential NULL deref in dsmark_init()
	vsock: Fix a lockdep warning in __vsock_release()
	net/rds: Fix error handling in rds_ib_add_one()
	xen-netfront: do not use ~0U as error return value for xennet_fill_frags()
	tipc: fix unlimited bundling of small messages
	sch_cbq: validate TCA_CBQ_WRROPT to avoid crash
	ipv6: Handle missing host route in __ipv6_ifa_notify
	Smack: Don't ignore other bprm->unsafe flags if LSM_UNSAFE_PTRACE is set
	smack: use GFP_NOFS while holding inode_smack::smk_lock
	NFC: fix attrs checks in netlink interface
	kexec: bail out upon SIGKILL when allocating memory.
	Linux 4.14.148

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 5c8d069c 42327896

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 147

SUBLEVEL = 148

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static inline bool access_error(unsigned int fsr, struct vm_area_struct *vma) 
{

	unsigned int mask = VM_READ | VM_WRITE | VM_EXEC;



	if (fsr & FSR_WRITE)

	if ((fsr & FSR_WRITE) && !(fsr & FSR_CM))

		mask = VM_WRITE;

	if (fsr & FSR_LNX_PF)

		mask = VM_EXEC;
@@ -285,7 +285,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 


	if (user_mode(regs))

		flags |= FAULT_FLAG_USER;

	if (fsr & FSR_WRITE)

	if ((fsr & FSR_WRITE) && !(fsr & FSR_CM))

		flags |= FAULT_FLAG_WRITE;



	/*

arch/arm/mm/fault.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 * Fault status register encodings.  We steal bit 31 for our own purposes.

 */

#define FSR_LNX_PF		(1 << 31)

#define FSR_CM			(1 << 13)

#define FSR_WRITE		(1 << 11)

#define FSR_FS4			(1 << 10)

#define FSR_FS3_0		(15)

arch/arm/mm/mmu.c

+16 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,22 @@ void __init adjust_lowmem_bounds(void) 
	 */

	vmalloc_limit = (u64)(uintptr_t)vmalloc_min - PAGE_OFFSET + PHYS_OFFSET;



	/*

	 * The first usable region must be PMD aligned. Mark its start

	 * as MEMBLOCK_NOMAP if it isn't

	 */

	for_each_memblock(memory, reg) {

		if (!memblock_is_nomap(reg)) {

			if (!IS_ALIGNED(reg->base, PMD_SIZE)) {

				phys_addr_t len;



				len = round_up(reg->base, PMD_SIZE) - reg->base;

				memblock_mark_nomap(reg->base, len);

			}

			break;

		}

	}



	for_each_memblock(memory, reg) {

		phys_addr_t block_start = reg->base;

		phys_addr_t block_end = reg->base + reg->size;

arch/arm64/include/asm/cmpxchg.h

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ __XCHG_CASE( , , mb_8, dmb ish, nop, , a, l, "memory") 
#undef __XCHG_CASE



#define __XCHG_GEN(sfx)							\

static inline unsigned long __xchg##sfx(unsigned long x,		\

static __always_inline  unsigned long __xchg##sfx(unsigned long x,	\

					volatile void *ptr,		\

					int size)			\

{									\
@@ -115,7 +115,7 @@ __XCHG_GEN(_mb) 
#define xchg(...)		__xchg_wrapper( _mb, __VA_ARGS__)



#define __CMPXCHG_GEN(sfx)						\

static inline unsigned long __cmpxchg##sfx(volatile void *ptr,		\

static __always_inline unsigned long __cmpxchg##sfx(volatile void *ptr,	\

					   unsigned long old,		\

					   unsigned long new,		\

					   int size)			\
@@ -248,7 +248,7 @@ __CMPWAIT_CASE( , , 8); 
#undef __CMPWAIT_CASE



#define __CMPWAIT_GEN(sfx)						\

static inline void __cmpwait##sfx(volatile void *ptr,			\

static __always_inline void __cmpwait##sfx(volatile void *ptr,		\

				  unsigned long val,			\

				  int size)				\

{									\