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

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

Merge 4.14.61 into android-4.14 



Changes in 4.14.61
	bonding: avoid lockdep confusion in bond_get_stats()
	inet: frag: enforce memory limits earlier
	ipv4: frags: handle possible skb truesize change
	net: dsa: Do not suspend/resume closed slave_dev
	netlink: Fix spectre v1 gadget in netlink_create()
	net: stmmac: Fix WoL for PCI-based setups
	rxrpc: Fix user call ID check in rxrpc_service_prealloc_one
	net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager
	squashfs: more metadata hardening
	squashfs: more metadata hardenings
	can: ems_usb: Fix memory leak on ems_usb_disconnect()
	net: socket: fix potential spectre v1 gadget in socketcall
	virtio_balloon: fix another race between migration and ballooning
	x86/apic: Future-proof the TSC_DEADLINE quirk for SKX
	x86/entry/64: Remove %ebx handling from error_entry/exit
	kvm: x86: vmx: fix vpid leak
	audit: fix potential null dereference 'context->module.name'
	userfaultfd: remove uffd flags from vma->vm_flags if UFFD_EVENT_FORK fails
	iwlwifi: add more card IDs for 9000 series
	RDMA/uverbs: Expand primary and alt AV port checks
	crypto: padlock-aes - Fix Nano workaround data corruption
	drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats
	scsi: sg: fix minor memory leak in error path
	Linux 4.14.61

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 6f2e09c9 2ae6c041

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 60

SUBLEVEL = 61

EXTRAVERSION =

NAME = Petit Gorille

arch/x86/entry/entry_64.S

+4 −14
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ ENTRY(\sym) 


	call	\do_sym



	jmp	error_exit			/* %ebx: no swapgs flag */

	jmp	error_exit

	.endif

END(\sym)

.endm
@@ -1166,7 +1166,6 @@ END(paranoid_exit) 


/*

 * Save all registers in pt_regs, and switch GS if needed.

 * Return: EBX=0: came from user mode; EBX=1: otherwise

 */

ENTRY(error_entry)

	UNWIND_HINT_FUNC
@@ -1213,7 +1212,6 @@ ENTRY(error_entry) 
	 * for these here too.

	 */

.Lerror_kernelspace:

	incl	%ebx

	leaq	native_irq_return_iret(%rip), %rcx

	cmpq	%rcx, RIP+8(%rsp)

	je	.Lerror_bad_iret
@@ -1247,28 +1245,20 @@ ENTRY(error_entry) 


	/*

	 * Pretend that the exception came from user mode: set up pt_regs

	 * as if we faulted immediately after IRET and clear EBX so that

	 * error_exit knows that we will be returning to user mode.

	 * as if we faulted immediately after IRET.

	 */

	mov	%rsp, %rdi

	call	fixup_bad_iret

	mov	%rax, %rsp

	decl	%ebx

	jmp	.Lerror_entry_from_usermode_after_swapgs

END(error_entry)





/*

 * On entry, EBX is a "return to kernel mode" flag:

 *   1: already in kernel mode, don't need SWAPGS

 *   0: user gsbase is loaded, we need SWAPGS and standard preparation for return to usermode

 */

ENTRY(error_exit)

	UNWIND_HINT_REGS

	DISABLE_INTERRUPTS(CLBR_ANY)

	TRACE_IRQS_OFF

	testl	%ebx, %ebx

	jnz	retint_kernel

	testb	$3, CS(%rsp)

	jz	retint_kernel

	jmp	retint_user

END(error_exit)

arch/x86/kernel/apic/apic.c

+3 −0
Original line number Diff line number Diff line
@@ -580,6 +580,9 @@ static u32 skx_deadline_rev(void) 
	case 0x04: return 0x02000014;

	}



	if (boot_cpu_data.x86_stepping > 4)

		return 0;



	return ~0U;

}

arch/x86/kvm/vmx.c

+3 −4
Original line number Diff line number Diff line
@@ -7354,6 +7354,8 @@ static int enter_vmx_operation(struct kvm_vcpu *vcpu) 
		     HRTIMER_MODE_REL_PINNED);

	vmx->nested.preemption_timer.function = vmx_preemption_timer_fn;



	vmx->nested.vpid02 = allocate_vpid();



	vmx->nested.vmxon = true;

	return 0;
@@ -9802,10 +9804,8 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
			goto free_vmcs;

	}



	if (nested) {

	if (nested)

		nested_vmx_setup_ctls_msrs(vmx);

		vmx->nested.vpid02 = allocate_vpid();

	}



	vmx->nested.posted_intr_nv = -1;

	vmx->nested.current_vmptr = -1ull;
@@ -9822,7 +9822,6 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
	return &vmx->vcpu;



free_vmcs:

	free_vpid(vmx->nested.vpid02);

	free_loaded_vmcs(vmx->loaded_vmcs);

free_msrs:

	kfree(vmx->guest_msrs);

drivers/crypto/padlock-aes.c

+6 −2
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key, 
		return;

	}



	count -= initial;



	if (initial)

		asm volatile (".byte 0xf3,0x0f,0xa7,0xc8"	/* rep xcryptecb */

			      : "+S"(input), "+D"(output)
@@ -273,7 +275,7 @@ static inline void padlock_xcrypt_ecb(const u8 *input, u8 *output, void *key, 


	asm volatile (".byte 0xf3,0x0f,0xa7,0xc8"	/* rep xcryptecb */

		      : "+S"(input), "+D"(output)

		      : "d"(control_word), "b"(key), "c"(count - initial));

		      : "d"(control_word), "b"(key), "c"(count));

}



static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key,
@@ -284,6 +286,8 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, 
	if (count < cbc_fetch_blocks)

		return cbc_crypt(input, output, key, iv, control_word, count);



	count -= initial;



	if (initial)

		asm volatile (".byte 0xf3,0x0f,0xa7,0xd0"	/* rep xcryptcbc */

			      : "+S" (input), "+D" (output), "+a" (iv)
@@ -291,7 +295,7 @@ static inline u8 *padlock_xcrypt_cbc(const u8 *input, u8 *output, void *key, 


	asm volatile (".byte 0xf3,0x0f,0xa7,0xd0"	/* rep xcryptcbc */

		      : "+S" (input), "+D" (output), "+a" (iv)

		      : "d" (control_word), "b" (key), "c" (count-initial));

		      : "d" (control_word), "b" (key), "c" (count));

	return iv;

}