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

Commit 75fe13d3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.22 into android-3.18 



Changes in 3.18.22:
	x86/xen: Initialize cr4 shadow for 64-bit PV(H) guests
	ipc,sem: fix use after free on IPC_RMID after a task using same semaphore set exits
	ipc/sem.c: update/correct memory barriers
	mm/hwpoison: fix page refcount of unknown non LRU page
	mm: hugetlb: introduce page_huge_active
	mm/hwpoison: fix fail isolate hugetlbfs page w/ refcount held
	xen-blkfront: don't add indirect pages to list when !feature_persistent
	xen-blkback: replace work_pending with work_busy in purge_persistent_gnt()
	perf: Fix fasync handling on inherited events
	perf: Fix PERF_EVENT_IOC_PERIOD migration race
	rtlwifi: rtl8723be: Add module parameter for MSI interrupts
	x86/xen: build "Xen PV" APIC driver for domU as well
	dm thin metadata: delete btrees when releasing metadata snapshot
	localmodconfig: Use Kbuild files too
	EDAC, ppc4xx: Access mci->csrows array elements properly
	drm/radeon: add new OLAND pci id
	drm/vmwgfx: Fix execbuf locking issues
	libfc: Fix fc_exch_recv_req() error path
	libfc: Fix fc_fcp_cleanup_each_cmd()
	mfd: arizona: Fix initialisation of the PM runtime
	regmap: regcache-rbtree: Clean new present bits on present bitmap resize
	MIPS: Fix seccomp syscall argument for MIPS64
	libiscsi: Fix host busy blocking during connection teardown
	sd: Fix maximum I/O size for BLOCK_PC requests
	crypto: caam - fix memory corruption in ahash_final_ctx
	cpuset: use trialcs->mems_allowed as a temp variable
	Add factory recertified Crucial M500s to blacklist
	arm64: KVM: Fix host crash when injecting a fault into a 32bit guest
	x86/xen: make CONFIG_XEN depend on CONFIG_X86_LOCAL_APIC
	ALSA: usb: Add native DSD support for Gustard DAC-X20U
	SCSI: Fix NULL pointer dereference in runtime PM
	HID: usbhid: add Chicony/Pixart usb optical mouse that needs QUIRK_ALWAYS_POLL
	x86/nmi: Enable nested do_nmi() handling for 64-bit kernels
	x86/nmi/64: Remove asm code that saves CR2
	x86/nmi/64: Switch stacks on userspace NMI entry
	rcu: Move lockless_dereference() out of rcupdate.h
	x86/ldt: Make modify_ldt synchronous
	x86/ldt: Correct LDT access in single stepping logic
	mfd: lpc_ich: Assign subdevice ids automatically
	drm/radeon: fix hotplug race at startup
	ipv6: Make MLD packets to only be processed locally
	net: graceful exit from netif_alloc_netdev_queues()
	ip_tunnel: fix ipv4 pmtu check to honor inner ip header df
	net/tipc: initialize security state for new connection socket
	bridge: mdb: zero out the local br_ip variable before use
	net: pktgen: fix race between pktgen_thread_worker() and kthread_stop()
	net: do not process device backlog during unregistration
	net: Fix skb csum races when peeking
	bridge: mdb: fix double add notification
	isdn/gigaset: reset tty->receive_room when attaching ser_gigaset
	ipv6: lock socket in ip6_datagram_connect()
	bonding: fix destruction of bond with devices different from arphrd_ether
	bonding: correct the MAC address for "follow" fail_over_mac policy
	inet: frags: fix defragmented packet's IP header for af_packet
	netlink: don't hold mutex in rcu callback when releasing mmapd ring
	net/mlx4_core: Fix wrong index in propagating port change event to VFs
	rds: fix an integer overflow test in rds_info_getsockopt()
	lpfc: Fix scsi prep dma buf error.
	net: call rcu_read_lock early in process_backlog
	Linux 3.18.22

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 41e6d06e ac6d8ef9

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 21

SUBLEVEL = 22

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arm64/kvm/inject_fault.c

+6 −6
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ void kvm_inject_dabt(struct kvm_vcpu *vcpu, unsigned long addr) 
{

	if (!(vcpu->arch.hcr_el2 & HCR_RW))

		inject_abt32(vcpu, false, addr);



	else

		inject_abt64(vcpu, false, addr);

}
@@ -184,7 +184,7 @@ void kvm_inject_pabt(struct kvm_vcpu *vcpu, unsigned long addr) 
{

	if (!(vcpu->arch.hcr_el2 & HCR_RW))

		inject_abt32(vcpu, true, addr);



	else

		inject_abt64(vcpu, true, addr);

}
@@ -198,6 +198,6 @@ void kvm_inject_undefined(struct kvm_vcpu *vcpu) 
{

	if (!(vcpu->arch.hcr_el2 & HCR_RW))

		inject_undef32(vcpu);



	else

		inject_undef64(vcpu);

}

arch/mips/kernel/scall64-64.S

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ syscall_trace_entry: 
	SAVE_STATIC

	move	s0, t2

	move	a0, sp

	daddiu	a1, v0, __NR_64_Linux

	move	a1, v0

	jal	syscall_trace_enter



	bltz	v0, 2f			# seccomp failed? Skip syscall

arch/mips/kernel/scall64-n32.S

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ n32_syscall_trace_entry: 
	SAVE_STATIC

	move	s0, t2

	move	a0, sp

	daddiu	a1, v0, __NR_N32_Linux

	move	a1, v0

	jal	syscall_trace_enter



	bltz	v0, 2f			# seccomp failed? Skip syscall

arch/x86/include/asm/desc.h

+0 −15
Original line number Diff line number Diff line
@@ -280,21 +280,6 @@ static inline void clear_LDT(void) 
	set_ldt(NULL, 0);

}



/*

 * load one particular LDT into the current CPU

 */

static inline void load_LDT_nolock(mm_context_t *pc)

{

	set_ldt(pc->ldt, pc->size);

}



static inline void load_LDT(mm_context_t *pc)

{

	preempt_disable();

	load_LDT_nolock(pc);

	preempt_enable();

}



static inline unsigned long get_desc_base(const struct desc_struct *desc)

{

	return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));