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

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

Merge 4.9.162 into android-4.9 



Changes in 4.9.162
	Revert "loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()"
	Revert "loop: Get rid of loop_index_mutex"
	Revert "loop: Fold __loop_release into loop_release"
	scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached
	drm/msm: Unblock writer if reader closes file
	ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field
	ALSA: compress: prevent potential divide by zero bugs
	thermal: int340x_thermal: Fix a NULL vs IS_ERR() check
	usb: dwc3: gadget: synchronize_irq dwc irq in suspend
	usb: dwc3: gadget: Fix the uninitialized link_state when udc starts
	usb: gadget: Potential NULL dereference on allocation error
	ASoC: dapm: change snprintf to scnprintf for possible overflow
	ASoC: imx-audmux: change snprintf to scnprintf for possible overflow
	ARC: fix __ffs return value to avoid build warnings
	drivers: thermal: int340x_thermal: Fix sysfs race condition
	mac80211: fix miscounting of ttl-dropped frames
	locking/rwsem: Fix (possible) missed wakeup
	serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling
	direct-io: allow direct writes to empty inodes
	scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state()
	net: altera_tse: fix connect_local_phy error path
	net: usb: asix: ax88772_bind return error when hw_reset fail
	ibmveth: Do not process frames after calling napi_reschedule
	mac80211: don't initiate TDLS connection if station is not associated to AP
	mac80211: Add attribute aligned(2) to struct 'action'
	cfg80211: extend range deviation for DMG
	svm: Fix AVIC incomplete IPI emulation
	KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1
	powerpc: Always initialize input array when calling epapr_hypercall()
	mmc: spi: Fix card detection during probe
	mm: enforce min addr even if capable() in expand_downwards()
	x86/uaccess: Don't leak the AC flag into __put_user() value evaluation
	Linux 4.9.162

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 63e0afa9 f422a02f

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 161

SUBLEVEL = 162

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/include/asm/bitops.h

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static inline __attribute__ ((const)) int __fls(unsigned long x) 
/*

 * __ffs: Similar to ffs, but zero based (0-31)

 */

static inline __attribute__ ((const)) int __ffs(unsigned long word)

static inline __attribute__ ((const)) unsigned long __ffs(unsigned long word)

{

	if (!word)

		return word;
@@ -400,9 +400,9 @@ static inline __attribute__ ((const)) int ffs(unsigned long x) 
/*

 * __ffs: Similar to ffs, but zero based (0-31)

 */

static inline __attribute__ ((const)) int __ffs(unsigned long x)

static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)

{

	int n;

	unsigned long n;



	asm volatile(

	"	ffs.f	%0, %1		\n"  /* 0:31; 31(Z) if src 0 */

arch/powerpc/include/asm/epapr_hcalls.h

+6 −6
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in, 


static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];

	unsigned long r;
@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) 


static inline long epapr_hypercall0(unsigned int nr)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	return epapr_hypercall(in, out, nr);
@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr) 


static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) 
static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,

				    unsigned long p2)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, 
static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,

				    unsigned long p2, unsigned long p3)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, 
				    unsigned long p2, unsigned long p3,

				    unsigned long p4)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;

arch/x86/include/asm/uaccess.h

+4 −3
Original line number Diff line number Diff line
@@ -298,8 +298,7 @@ do { \ 
		__put_user_asm(x, ptr, retval, "l", "k", "ir", errret);	\

		break;							\

	case 8:								\

		__put_user_asm_u64((__typeof__(*ptr))(x), ptr, retval,	\

				   errret);				\

		__put_user_asm_u64(x, ptr, retval, errret);		\

		break;							\

	default:							\

		__put_user_bad();					\
@@ -433,8 +432,10 @@ do { \ 
#define __put_user_nocheck(x, ptr, size)			\

({								\

	int __pu_err;						\

	__typeof__(*(ptr)) __pu_val;				\

	__pu_val = x;						\

	__uaccess_begin();					\

	__put_user_size((x), (ptr), (size), __pu_err, -EFAULT);	\

	__put_user_size(__pu_val, (ptr), (size), __pu_err, -EFAULT);\

	__uaccess_end();					\

	__builtin_expect(__pu_err, 0);				\

})

arch/x86/kvm/svm.c

+12 −15
Original line number Diff line number Diff line
@@ -2862,6 +2862,14 @@ static int nested_svm_vmexit(struct vcpu_svm *svm) 
	kvm_mmu_reset_context(&svm->vcpu);

	kvm_mmu_load(&svm->vcpu);



	/*

	 * Drop what we picked up for L2 via svm_complete_interrupts() so it

	 * doesn't end up in L1.

	 */

	svm->vcpu.arch.nmi_injected = false;

	kvm_clear_exception_queue(&svm->vcpu);

	kvm_clear_interrupt_queue(&svm->vcpu);



	return 0;

}
@@ -3932,25 +3940,14 @@ static int avic_incomplete_ipi_interception(struct vcpu_svm *svm) 
		kvm_lapic_reg_write(apic, APIC_ICR, icrl);

		break;

	case AVIC_IPI_FAILURE_TARGET_NOT_RUNNING: {

		int i;

		struct kvm_vcpu *vcpu;

		struct kvm *kvm = svm->vcpu.kvm;

		struct kvm_lapic *apic = svm->vcpu.arch.apic;



		/*

		 * At this point, we expect that the AVIC HW has already

		 * set the appropriate IRR bits on the valid target

		 * vcpus. So, we just need to kick the appropriate vcpu.

		 * Update ICR high and low, then emulate sending IPI,

		 * which is handled when writing APIC_ICR.

		 */

		kvm_for_each_vcpu(i, vcpu, kvm) {

			bool m = kvm_apic_match_dest(vcpu, apic,

						     icrl & KVM_APIC_SHORT_MASK,

						     GET_APIC_DEST_FIELD(icrh),

						     icrl & KVM_APIC_DEST_MASK);



			if (m && !avic_vcpu_is_running(vcpu))

				kvm_vcpu_wake_up(vcpu);

		}

		kvm_lapic_reg_write(apic, APIC_ICR2, icrh);

		kvm_lapic_reg_write(apic, APIC_ICR, icrl);

		break;

	}

	case AVIC_IPI_FAILURE_INVALID_TARGET: