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

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

Merge 4.19.208 into android-4.19-stable 



Changes in 4.19.208
	s390/bpf: Fix optimizing out zero-extensions
	KVM: remember position in kvm->vcpus array
	rcu: Fix missed wakeup of exp_wq waiters
	apparmor: remove duplicate macro list_entry_is_head()
	crypto: talitos - fix max key size for sha384 and sha512
	tracing/kprobe: Fix kprobe_on_func_entry() modification
	sctp: validate chunk size in __rcv_asconf_lookup
	sctp: add param size validation for SCTP_PARAM_SET_PRIMARY
	dmaengine: acpi: Avoid comparison GSI with Linux vIRQ
	thermal/drivers/exynos: Fix an error code in exynos_tmu_probe()
	9p/trans_virtio: Remove sysfs file on probe failure
	prctl: allow to setup brk for et_dyn executables
	nilfs2: use refcount_dec_and_lock() to fix potential UAF
	profiling: fix shift-out-of-bounds bugs
	pwm: lpc32xx: Don't modify HW state in .probe() after the PWM chip was registered
	Kconfig.debug: drop selecting non-existing HARDLOCKUP_DETECTOR_ARCH
	drivers: base: cacheinfo: Get rid of DEFINE_SMP_CALL_CACHE_FUNCTION()
	parisc: Move pci_dev_is_behind_card_dino to where it is used
	dmaengine: sprd: Add missing MODULE_DEVICE_TABLE
	dmaengine: ioat: depends on !UML
	dmaengine: xilinx_dma: Set DMA mask for coherent APIs
	ceph: lockdep annotations for try_nonblocking_invalidate
	nilfs2: fix memory leak in nilfs_sysfs_create_device_group
	nilfs2: fix NULL pointer in nilfs_##name##_attr_release
	nilfs2: fix memory leak in nilfs_sysfs_create_##name##_group
	nilfs2: fix memory leak in nilfs_sysfs_delete_##name##_group
	nilfs2: fix memory leak in nilfs_sysfs_create_snapshot_group
	nilfs2: fix memory leak in nilfs_sysfs_delete_snapshot_group
	pwm: img: Don't modify HW state in .remove() callback
	pwm: rockchip: Don't modify HW state in .remove() callback
	pwm: stm32-lp: Don't modify HW state in .remove() callback
	blk-throttle: fix UAF by deleteing timer in blk_throtl_exit()
	drm/nouveau/nvkm: Replace -ENOSYS with -ENODEV
	Linux 4.19.208

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I600844898dabfffbfdcf6ab298fea2c270a1c691
parents 7ddda2f4 c2276d58

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 207

SUBLEVEL = 208

EXTRAVERSION =

NAME = "People's Front"

arch/arm64/kernel/cacheinfo.c

+2 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void ci_leaf_init(struct cacheinfo *this_leaf, 
	this_leaf->type = type;

}



static int __init_cache_level(unsigned int cpu)

int init_cache_level(unsigned int cpu)

{

	unsigned int ctype, level, leaves, fw_level;

	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
@@ -80,7 +80,7 @@ static int __init_cache_level(unsigned int cpu) 
	return 0;

}



static int __populate_cache_leaves(unsigned int cpu)

int populate_cache_leaves(unsigned int cpu)

{

	unsigned int level, idx;

	enum cache_type type;
@@ -99,6 +99,3 @@ static int __populate_cache_leaves(unsigned int cpu) 
	}

	return 0;

}
 


DEFINE_SMP_CALL_CACHE_FUNCTION(init_cache_level)

DEFINE_SMP_CALL_CACHE_FUNCTION(populate_cache_leaves)

arch/mips/kernel/cacheinfo.c

+2 −5
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ do { \ 
	leaf++;							\

} while (0)



static int __init_cache_level(unsigned int cpu)

int init_cache_level(unsigned int cpu)

{

	struct cpuinfo_mips *c = &current_cpu_data;

	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
@@ -80,7 +80,7 @@ static void fill_cpumask_cluster(int cpu, cpumask_t *cpu_map) 
			cpumask_set_cpu(cpu1, cpu_map);

}



static int __populate_cache_leaves(unsigned int cpu)

int populate_cache_leaves(unsigned int cpu)

{

	struct cpuinfo_mips *c = &current_cpu_data;

	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
@@ -109,6 +109,3 @@ static int __populate_cache_leaves(unsigned int cpu) 


	return 0;

}
 


DEFINE_SMP_CALL_CACHE_FUNCTION(init_cache_level)

DEFINE_SMP_CALL_CACHE_FUNCTION(populate_cache_leaves)

arch/riscv/kernel/cacheinfo.c

+2 −5
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static void ci_leaf_init(struct cacheinfo *this_leaf, 
		| CACHE_WRITE_ALLOCATE;

}



static int __init_cache_level(unsigned int cpu)

int init_cache_level(unsigned int cpu)

{

	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);

	struct device_node *np = of_cpu_device_node_get(cpu);
@@ -67,7 +67,7 @@ static int __init_cache_level(unsigned int cpu) 
	return 0;

}



static int __populate_cache_leaves(unsigned int cpu)

int populate_cache_leaves(unsigned int cpu)

{

	struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);

	struct cacheinfo *this_leaf = this_cpu_ci->info_list;
@@ -99,6 +99,3 @@ static int __populate_cache_leaves(unsigned int cpu) 


	return 0;

}
 


DEFINE_SMP_CALL_CACHE_FUNCTION(init_cache_level)

DEFINE_SMP_CALL_CACHE_FUNCTION(populate_cache_leaves)

arch/s390/net/bpf_jit_comp.c

+26 −24
Original line number Diff line number Diff line
@@ -561,10 +561,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		EMIT4(0xb9080000, dst_reg, src_reg);

		break;

	case BPF_ALU | BPF_ADD | BPF_K: /* dst = (u32) dst + (u32) imm */

		if (!imm)

			break;

		if (imm != 0) {

			/* alfi %dst,imm */

			EMIT6_IMM(0xc20b0000, dst_reg, imm);

		}

		EMIT_ZERO(dst_reg);

		break;

	case BPF_ALU64 | BPF_ADD | BPF_K: /* dst = dst + imm */
@@ -586,10 +586,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		EMIT4(0xb9090000, dst_reg, src_reg);

		break;

	case BPF_ALU | BPF_SUB | BPF_K: /* dst = (u32) dst - (u32) imm */

		if (!imm)

			break;

		if (imm != 0) {

			/* alfi %dst,-imm */

			EMIT6_IMM(0xc20b0000, dst_reg, -imm);

		}

		EMIT_ZERO(dst_reg);

		break;

	case BPF_ALU64 | BPF_SUB | BPF_K: /* dst = dst - imm */
@@ -616,10 +616,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		EMIT4(0xb90c0000, dst_reg, src_reg);

		break;

	case BPF_ALU | BPF_MUL | BPF_K: /* dst = (u32) dst * (u32) imm */

		if (imm == 1)

			break;

		if (imm != 1) {

			/* msfi %r5,imm */

			EMIT6_IMM(0xc2010000, dst_reg, imm);

		}

		EMIT_ZERO(dst_reg);

		break;

	case BPF_ALU64 | BPF_MUL | BPF_K: /* dst = dst * imm */
@@ -670,6 +670,8 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
			if (BPF_OP(insn->code) == BPF_MOD)

				/* lhgi %dst,0 */

				EMIT4_IMM(0xa7090000, dst_reg, 0);

			else

				EMIT_ZERO(dst_reg);

			break;

		}

		/* lhi %w0,0 */
@@ -762,10 +764,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		EMIT4(0xb9820000, dst_reg, src_reg);

		break;

	case BPF_ALU | BPF_XOR | BPF_K: /* dst = (u32) dst ^ (u32) imm */

		if (!imm)

			break;

		if (imm != 0) {

			/* xilf %dst,imm */

			EMIT6_IMM(0xc0070000, dst_reg, imm);

		}

		EMIT_ZERO(dst_reg);

		break;

	case BPF_ALU64 | BPF_XOR | BPF_K: /* dst = dst ^ imm */
@@ -786,10 +788,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		EMIT6_DISP_LH(0xeb000000, 0x000d, dst_reg, dst_reg, src_reg, 0);

		break;

	case BPF_ALU | BPF_LSH | BPF_K: /* dst = (u32) dst << (u32) imm */

		if (imm == 0)

			break;

		if (imm != 0) {

			/* sll %dst,imm(%r0) */

			EMIT4_DISP(0x89000000, dst_reg, REG_0, imm);

		}

		EMIT_ZERO(dst_reg);

		break;

	case BPF_ALU64 | BPF_LSH | BPF_K: /* dst = dst << imm */
@@ -811,10 +813,10 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		EMIT6_DISP_LH(0xeb000000, 0x000c, dst_reg, dst_reg, src_reg, 0);

		break;

	case BPF_ALU | BPF_RSH | BPF_K: /* dst = (u32) dst >> (u32) imm */

		if (imm == 0)

			break;

		if (imm != 0) {

			/* srl %dst,imm(%r0) */

			EMIT4_DISP(0x88000000, dst_reg, REG_0, imm);

		}

		EMIT_ZERO(dst_reg);

		break;

	case BPF_ALU64 | BPF_RSH | BPF_K: /* dst = dst >> imm */