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

Commit 379e3b2a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.53 into android-4.9 



Changes in 4.9.53
	cifs: release cifs root_cred after exit_cifs
	cifs: release auth_key.response for reconnect.
	fs/proc: Report eip/esp in /prod/PID/stat for coredumping
	mac80211: fix VLAN handling with TXQs
	mac80211_hwsim: Use proper TX power
	mac80211: flush hw_roc_start work before cancelling the ROC
	genirq: Make sparse_irq_lock protect what it should protect
	KVM: PPC: Book3S: Fix race and leak in kvm_vm_ioctl_create_spapr_tce()
	KVM: PPC: Book3S HV: Protect updates to spapr_tce_tables list
	tracing: Fix trace_pipe behavior for instance traces
	tracing: Erase irqsoff trace with empty write
	md/raid5: fix a race condition in stripe batch
	md/raid5: preserve STRIPE_ON_UNPLUG_LIST in break_stripe_batch_list
	scsi: scsi_transport_iscsi: fix the issue that iscsi_if_rx doesn't parse nlmsg properly
	drm/radeon: disable hard reset in hibernate for APUs
	crypto: drbg - fix freeing of resources
	crypto: talitos - Don't provide setkey for non hmac hashing algs.
	crypto: talitos - fix sha224
	crypto: talitos - fix hashing
	security/keys: properly zero out sensitive key material in big_key
	security/keys: rewrite all of big_key crypto
	KEYS: fix writing past end of user-supplied buffer in keyring_read()
	KEYS: prevent creating a different user's keyrings
	KEYS: prevent KEYCTL_READ on negative key
	powerpc/pseries: Fix parent_dn reference leak in add_dt_node()
	powerpc/tm: Flush TM only if CPU has TM feature
	powerpc/ftrace: Pass the correct stack pointer for DYNAMIC_FTRACE_WITH_REGS
	s390/mm: fix write access check in gup_huge_pmd()
	PM: core: Fix device_pm_check_callbacks()
	Fix SMB3.1.1 guest authentication to Samba
	SMB3: Warn user if trying to sign connection that authenticated as guest
	SMB: Validate negotiate (to protect against downgrade) even if signing off
	SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags
	vfs: Return -ENXIO for negative SEEK_HOLE / SEEK_DATA offsets
	nl80211: check for the required netlink attributes presence
	bsg-lib: don't free job in bsg_prepare_job
	iw_cxgb4: remove the stid on listen create failure
	iw_cxgb4: put ep reference in pass_accept_req()
	selftests/seccomp: Support glibc 2.26 siginfo_t.h
	seccomp: fix the usage of get/put_seccomp_filter() in seccomp_get_filter()
	arm64: Make sure SPsel is always set
	arm64: fault: Route pte translation faults via do_translation_fault
	KVM: VMX: extract __pi_post_block
	KVM: VMX: avoid double list add with VT-d posted interrupts
	KVM: VMX: simplify and fix vmx_vcpu_pi_load
	kvm/x86: Handle async PF in RCU read-side critical sections
	KVM: VMX: Do not BUG() on out-of-bounds guest IRQ
	kvm: nVMX: Don't allow L2 to access the hardware CR8
	xfs: validate bdev support for DAX inode flag
	etnaviv: fix gem object list corruption
	PCI: Fix race condition with driver_override
	btrfs: fix NULL pointer dereference from free_reloc_roots()
	btrfs: propagate error to btrfs_cmp_data_prepare caller
	btrfs: prevent to set invalid default subvolid
	x86/mm: Fix fault error path using unsafe vma pointer
	x86/fpu: Don't let userspace set bogus xcomp_bv
	gfs2: Fix debugfs glocks dump
	timer/sysclt: Restrict timer migration sysctl values to 0 and 1
	KVM: VMX: do not change SN bit in vmx_update_pi_irte()
	KVM: VMX: remove WARN_ON_ONCE in kvm_vcpu_trigger_posted_interrupt
	cxl: Fix driver use count
	KVM: VMX: use cmpxchg64
	video: fbdev: aty: do not leak uninitialized padding in clk to userspace
	swiotlb-xen: implement xen_swiotlb_dma_mmap callback
	Linux 4.9.53

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3217cccb 1852eae9

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 52

SUBLEVEL = 53

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/xen/mm.c

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ static struct dma_map_ops xen_swiotlb_dma_ops = { 
	.unmap_page = xen_swiotlb_unmap_page,

	.dma_supported = xen_swiotlb_dma_supported,

	.set_dma_mask = xen_swiotlb_set_dma_mask,

	.mmap = xen_swiotlb_dma_mmap,

};



int __init xen_mm_init(void)

arch/arm64/kernel/head.S

+1 −0
Original line number Diff line number Diff line
@@ -486,6 +486,7 @@ ENTRY(kimage_vaddr) 
 * booted in EL1 or EL2 respectively.

 */

ENTRY(el2_setup)

	msr	SPsel, #1			// We want to use SP_EL{1,2}

	mrs	x0, CurrentEL

	cmp	x0, #CurrentEL_EL2

	b.ne	1f

arch/arm64/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static const struct fault_info fault_info[] = { 
	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"level 0 translation fault"	},

	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"level 1 translation fault"	},

	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"level 2 translation fault"	},

	{ do_page_fault,	SIGSEGV, SEGV_MAPERR,	"level 3 translation fault"	},

	{ do_translation_fault,	SIGSEGV, SEGV_MAPERR,	"level 3 translation fault"	},

	{ do_bad,		SIGBUS,  0,		"unknown 8"			},

	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"level 1 access flag fault"	},

	{ do_page_fault,	SIGSEGV, SEGV_ACCERR,	"level 2 access flag fault"	},

arch/powerpc/kernel/entry_64.S

+12 −8
Original line number Diff line number Diff line
@@ -1235,10 +1235,14 @@ _GLOBAL(ftrace_caller) 
	stdu	r1,-SWITCH_FRAME_SIZE(r1)



	/* Save all gprs to pt_regs */

	SAVE_8GPRS(0,r1)

	SAVE_8GPRS(8,r1)

	SAVE_8GPRS(16,r1)

	SAVE_8GPRS(24,r1)

	SAVE_GPR(0, r1)

	SAVE_10GPRS(2, r1)

	SAVE_10GPRS(12, r1)

	SAVE_10GPRS(22, r1)



	/* Save previous stack pointer (r1) */

	addi	r8, r1, SWITCH_FRAME_SIZE

	std	r8, GPR1(r1)



	/* Load special regs for save below */

	mfmsr   r8
@@ -1292,10 +1296,10 @@ ftrace_call: 
#endif



	/* Restore gprs */

	REST_8GPRS(0,r1)

	REST_8GPRS(8,r1)

	REST_8GPRS(16,r1)

	REST_8GPRS(24,r1)

	REST_GPR(0,r1)

	REST_10GPRS(2,r1)

	REST_10GPRS(12,r1)

	REST_10GPRS(22,r1)



	/* Restore callee's TOC */

	ld	r2, 24(r1)