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

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

Merge 4.19.165 into android-4.19-stable 



Changes in 4.19.165
	md/raid10: initialize r10_bio->read_slot before use.
	fscrypt: add fscrypt_is_nokey_name()
	ext4: prevent creating duplicate encrypted filenames
	f2fs: prevent creating duplicate encrypted filenames
	ubifs: prevent creating duplicate encrypted filenames
	vfio/pci: Move dummy_resources_list init in vfio_pci_probe()
	ext4: don't remount read-only with errors=continue on reboot
	uapi: move constants from <linux/kernel.h> to <linux/const.h>
	KVM: SVM: relax conditions for allowing MSR_IA32_SPEC_CTRL accesses
	KVM: x86: reinstate vendor-agnostic check on SPEC_CTRL cpuid bits
	powerpc/bitops: Fix possible undefined behaviour with fls() and fls64()
	xen/gntdev.c: Mark pages as dirty
	null_blk: Fix zone size initialization
	of: fix linker-section match-table corruption
	Bluetooth: hci_h5: close serdev device and free hu in h5_close
	reiserfs: add check for an invalid ih_entry_count
	misc: vmw_vmci: fix kernel info-leak by initializing dbells in vmci_ctx_get_chkpt_doorbells()
	media: gp8psk: initialize stats at power control logic
	ALSA: seq: Use bool for snd_seq_queue internal flags
	ALSA: rawmidi: Access runtime->avail always in spinlock
	fcntl: Fix potential deadlock in send_sig{io, urg}()
	rtc: sun6i: Fix memleak in sun6i_rtc_clk_init
	module: set MODULE_STATE_GOING state when a module fails to load
	quota: Don't overflow quota file offsets
	powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe()
	NFSv4: Fix a pNFS layout related use-after-free race when freeing the inode
	module: delay kobject uevent until after module init call
	ALSA: pcm: Clear the full allocated memory at hw_params
	dm verity: skip verity work if I/O error when system is shutting down
	Linux 4.19.165

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I211fed33aec407a84504c9031ad723890263d943
parents 25670ede 4143d798

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 164

SUBLEVEL = 165

EXTRAVERSION =

NAME = "People's Front"

arch/powerpc/include/asm/bitops.h

+21 −2
Original line number Diff line number Diff line
@@ -221,15 +221,34 @@ static __inline__ void __clear_bit_unlock(int nr, volatile unsigned long *addr) 
 */

static __inline__ int fls(unsigned int x)

{

	return 32 - __builtin_clz(x);

	int lz;



	if (__builtin_constant_p(x))

		return x ? 32 - __builtin_clz(x) : 0;

	asm("cntlzw %0,%1" : "=r" (lz) : "r" (x));

	return 32 - lz;

}



#include <asm-generic/bitops/builtin-__fls.h>



/*

 * 64-bit can do this using one cntlzd (count leading zeroes doubleword)

 * instruction; for 32-bit we use the generic version, which does two

 * 32-bit fls calls.

 */

#ifdef CONFIG_PPC64

static __inline__ int fls64(__u64 x)

{

	return 64 - __builtin_clzll(x);

	int lz;



	if (__builtin_constant_p(x))

		return x ? 64 - __builtin_clzll(x) : 0;

	asm("cntlzd %0,%1" : "=r" (lz) : "r" (x));

	return 64 - lz;

}

#else

#include <asm-generic/bitops/fls64.h>

#endif



#ifdef CONFIG_PPC64

unsigned int __arch_hweight8(unsigned int w);

arch/powerpc/sysdev/mpic_msgr.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int mpic_msgr_probe(struct platform_device *dev) 


	/* IO map the message register block. */

	of_address_to_resource(np, 0, &rsrc);

	msgr_block_addr = ioremap(rsrc.start, resource_size(&rsrc));

	msgr_block_addr = devm_ioremap(&dev->dev, rsrc.start, resource_size(&rsrc));

	if (!msgr_block_addr) {

		dev_err(&dev->dev, "Failed to iomap MPIC message registers");

		return -EFAULT;

arch/x86/kvm/cpuid.h

+14 −0
Original line number Diff line number Diff line
@@ -154,6 +154,20 @@ static inline int guest_cpuid_stepping(struct kvm_vcpu *vcpu) 
	return x86_stepping(best->eax);

}



static inline bool guest_has_spec_ctrl_msr(struct kvm_vcpu *vcpu)

{

	return (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) ||

		guest_cpuid_has(vcpu, X86_FEATURE_AMD_STIBP) ||

		guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBRS) ||

		guest_cpuid_has(vcpu, X86_FEATURE_AMD_SSBD));

}



static inline bool guest_has_pred_cmd_msr(struct kvm_vcpu *vcpu)

{

	return (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) ||

		guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBPB));

}



static inline bool supports_cpuid_fault(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.msr_platform_info & MSR_PLATFORM_INFO_CPUID_FAULT;

arch/x86/kvm/svm.c

+3 −6
Original line number Diff line number Diff line
@@ -4209,8 +4209,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		break;

	case MSR_IA32_SPEC_CTRL:

		if (!msr_info->host_initiated &&

		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBRS) &&

		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_SSBD))

		    !guest_has_spec_ctrl_msr(vcpu))

			return 1;



		msr_info->data = svm->spec_ctrl;
@@ -4312,8 +4311,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) 
		break;

	case MSR_IA32_SPEC_CTRL:

		if (!msr->host_initiated &&

		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBRS) &&

		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_SSBD))

		    !guest_has_spec_ctrl_msr(vcpu))

			return 1;



		/* The STIBP bit doesn't fault even if it's not advertised */
@@ -4340,12 +4338,11 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) 
		break;

	case MSR_IA32_PRED_CMD:

		if (!msr->host_initiated &&

		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBPB))

		    !guest_has_pred_cmd_msr(vcpu))

			return 1;



		if (data & ~PRED_CMD_IBPB)

			return 1;



		if (!data)

			break;