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

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

Merge 4.19.118 into android-4.19 



Changes in 4.19.118
	arm, bpf: Fix offset overflow for BPF_MEM BPF_DW
	objtool: Fix switch table detection in .text.unlikely
	scsi: sg: add sg_remove_request in sg_common_write
	ext4: use non-movable memory for superblock readahead
	watchdog: sp805: fix restart handler
	arm, bpf: Fix bugs with ALU64 {RSH, ARSH} BPF_K shift by 0
	ARM: dts: imx6: Use gpc for FEC interrupt controller to fix wake on LAN.
	netfilter: nf_tables: report EOPNOTSUPP on unsupported flags/object type
	irqchip/mbigen: Free msi_desc on device teardown
	ALSA: hda: Don't release card at firmware loading error
	of: unittest: kmemleak on changeset destroy
	of: unittest: kmemleak in of_unittest_platform_populate()
	of: unittest: kmemleak in of_unittest_overlay_high_level()
	of: overlay: kmemleak in dup_and_fixup_symbol_prop()
	x86/Hyper-V: Report crash register data or kmsg before running crash kernel
	lib/raid6: use vdupq_n_u8 to avoid endianness warnings
	video: fbdev: sis: Remove unnecessary parentheses and commented code
	rbd: avoid a deadlock on header_rwsem when flushing notifies
	rbd: call rbd_dev_unprobe() after unwatching and flushing notifies
	xsk: Add missing check on user supplied headroom size
	x86/Hyper-V: Unload vmbus channel in hv panic callback
	x86/Hyper-V: Free hv_panic_page when fail to register kmsg dump
	x86/Hyper-V: Trigger crash enlightenment only once during system crash.
	x86/Hyper-V: Report crash register data when sysctl_record_panic_msg is not set
	x86/Hyper-V: Report crash data in die() when panic_on_oops is set
	clk: at91: usb: continue if clk_hw_round_rate() return zero
	power: supply: bq27xxx_battery: Silence deferred-probe error
	clk: tegra: Fix Tegra PMC clock out parents
	soc: imx: gpc: fix power up sequencing
	rtc: 88pm860x: fix possible race condition
	NFSv4/pnfs: Return valid stateids in nfs_layout_find_inode_by_stateid()
	NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails
	s390/cpuinfo: fix wrong output when CPU0 is offline
	powerpc/maple: Fix declaration made after definition
	s390/cpum_sf: Fix wrong page count in error message
	ext4: do not commit super on read-only bdev
	um: ubd: Prevent buffer overrun on command completion
	cifs: Allocate encryption header through kmalloc
	include/linux/swapops.h: correct guards for non_swap_entry()
	percpu_counter: fix a data race at vm_committed_as
	compiler.h: fix error in BUILD_BUG_ON() reporting
	KVM: s390: vsie: Fix possible race when shadowing region 3 tables
	x86: ACPI: fix CPU hotplug deadlock
	drm/amdkfd: kfree the wrong pointer
	NFS: Fix memory leaks in nfs_pageio_stop_mirroring()
	f2fs: fix NULL pointer dereference in f2fs_write_begin()
	drm/vc4: Fix HDMI mode validation
	iommu/vt-d: Fix mm reference leak
	ext2: fix empty body warnings when -Wextra is used
	ext2: fix debug reference to ext2_xattr_cache
	power: supply: axp288_fuel_gauge: Broaden vendor check for Intel Compute Sticks.
	libnvdimm: Out of bounds read in __nd_ioctl()
	iommu/amd: Fix the configuration of GCR3 table root pointer
	f2fs: fix to wait all node page writeback
	net: dsa: bcm_sf2: Fix overflow checks
	fbdev: potential information leak in do_fb_ioctl()
	iio: si1133: read 24-bit signed integer for measurement
	tty: evh_bytechan: Fix out of bounds accesses
	locktorture: Print ratio of acquisitions, not failures
	mtd: spinand: Explicitly use MTD_OPS_RAW to write the bad block marker to OOB
	mtd: lpddr: Fix a double free in probe()
	mtd: phram: fix a double free issue in error path
	KEYS: Don't write out to userspace while holding key semaphore
	bpf: fix buggy r0 retval refinement for tracing helpers
	Linux 4.19.118

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ife34f739f719c332c7b1d22b1832179be6a16800
parents 8e14cd31 7edd66cf

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 117

SUBLEVEL = 118

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/imx6qdl.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -1013,9 +1013,8 @@ 
				compatible = "fsl,imx6q-fec";

				reg = <0x02188000 0x4000>;

				interrupt-names = "int0", "pps";

				interrupts-extended =

					<&intc 0 118 IRQ_TYPE_LEVEL_HIGH>,

					<&intc 0 119 IRQ_TYPE_LEVEL_HIGH>;

				interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>,

					     <0 119 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX6QDL_CLK_ENET>,

					 <&clks IMX6QDL_CLK_ENET>,

					 <&clks IMX6QDL_CLK_ENET_REF>;

arch/arm/boot/dts/imx6qp.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ 
};



&fec {

	/delete-property/interrupts-extended;

	interrupts = <0 118 IRQ_TYPE_LEVEL_HIGH>,

		     <0 119 IRQ_TYPE_LEVEL_HIGH>;

};

arch/arm/net/bpf_jit_32.c

+34 −18
Original line number Diff line number Diff line
@@ -930,7 +930,11 @@ static inline void emit_a32_rsh_i64(const s8 dst[], 
	rd = arm_bpf_get_reg64(dst, tmp, ctx);



	/* Do LSR operation */

	if (val < 32) {

	if (val == 0) {

		/* An immediate value of 0 encodes a shift amount of 32

		 * for LSR. To shift by 0, don't do anything.

		 */

	} else if (val < 32) {

		emit(ARM_MOV_SI(tmp2[1], rd[1], SRTYPE_LSR, val), ctx);

		emit(ARM_ORR_SI(rd[1], tmp2[1], rd[0], SRTYPE_ASL, 32 - val), ctx);

		emit(ARM_MOV_SI(rd[0], rd[0], SRTYPE_LSR, val), ctx);
@@ -956,7 +960,11 @@ static inline void emit_a32_arsh_i64(const s8 dst[], 
	rd = arm_bpf_get_reg64(dst, tmp, ctx);



	/* Do ARSH operation */

	if (val < 32) {

	if (val == 0) {

		/* An immediate value of 0 encodes a shift amount of 32

		 * for ASR. To shift by 0, don't do anything.

		 */

	} else if (val < 32) {

		emit(ARM_MOV_SI(tmp2[1], rd[1], SRTYPE_LSR, val), ctx);

		emit(ARM_ORR_SI(rd[1], tmp2[1], rd[0], SRTYPE_ASL, 32 - val), ctx);

		emit(ARM_MOV_SI(rd[0], rd[0], SRTYPE_ASR, val), ctx);
@@ -993,21 +1001,35 @@ static inline void emit_a32_mul_r64(const s8 dst[], const s8 src[], 
	arm_bpf_put_reg32(dst_hi, rd[0], ctx);

}



static bool is_ldst_imm(s16 off, const u8 size)

{

	s16 off_max = 0;



	switch (size) {

	case BPF_B:

	case BPF_W:

		off_max = 0xfff;

		break;

	case BPF_H:

		off_max = 0xff;

		break;

	case BPF_DW:

		/* Need to make sure off+4 does not overflow. */

		off_max = 0xfff - 4;

		break;

	}

	return -off_max <= off && off <= off_max;

}



/* *(size *)(dst + off) = src */

static inline void emit_str_r(const s8 dst, const s8 src[],

			      s32 off, struct jit_ctx *ctx, const u8 sz){

			      s16 off, struct jit_ctx *ctx, const u8 sz){

	const s8 *tmp = bpf2a32[TMP_REG_1];

	s32 off_max;

	s8 rd;



	rd = arm_bpf_get_reg32(dst, tmp[1], ctx);



	if (sz == BPF_H)

		off_max = 0xff;

	else

		off_max = 0xfff;



	if (off < 0 || off > off_max) {

	if (!is_ldst_imm(off, sz)) {

		emit_a32_mov_i(tmp[0], off, ctx);

		emit(ARM_ADD_R(tmp[0], tmp[0], rd), ctx);

		rd = tmp[0];
@@ -1036,18 +1058,12 @@ static inline void emit_str_r(const s8 dst, const s8 src[], 


/* dst = *(size*)(src + off) */

static inline void emit_ldx_r(const s8 dst[], const s8 src,

			      s32 off, struct jit_ctx *ctx, const u8 sz){

			      s16 off, struct jit_ctx *ctx, const u8 sz){

	const s8 *tmp = bpf2a32[TMP_REG_1];

	const s8 *rd = is_stacked(dst_lo) ? tmp : dst;

	s8 rm = src;

	s32 off_max;



	if (sz == BPF_H)

		off_max = 0xff;

	else

		off_max = 0xfff;



	if (off < 0 || off > off_max) {

	if (!is_ldst_imm(off, sz)) {

		emit_a32_mov_i(tmp[0], off, ctx);

		emit(ARM_ADD_R(tmp[0], tmp[0], src), ctx);

		rm = tmp[0];

arch/powerpc/platforms/maple/setup.c

+17 −17
Original line number Diff line number Diff line
@@ -299,23 +299,6 @@ static int __init maple_probe(void) 
	return 1;

}



define_machine(maple) {

	.name			= "Maple",

	.probe			= maple_probe,

	.setup_arch		= maple_setup_arch,

	.init_IRQ		= maple_init_IRQ,

	.pci_irq_fixup		= maple_pci_irq_fixup,

	.pci_get_legacy_ide_irq	= maple_pci_get_legacy_ide_irq,

	.restart		= maple_restart,

	.halt			= maple_halt,

       	.get_boot_time		= maple_get_boot_time,

       	.set_rtc_time		= maple_set_rtc_time,

       	.get_rtc_time		= maple_get_rtc_time,

      	.calibrate_decr		= generic_calibrate_decr,

	.progress		= maple_progress,

	.power_save		= power4_idle,

};



#ifdef CONFIG_EDAC

/*

 * Register a platform device for CPC925 memory controller on
@@ -372,3 +355,20 @@ static int __init maple_cpc925_edac_setup(void) 
}

machine_device_initcall(maple, maple_cpc925_edac_setup);

#endif



define_machine(maple) {

	.name			= "Maple",

	.probe			= maple_probe,

	.setup_arch		= maple_setup_arch,

	.init_IRQ		= maple_init_IRQ,

	.pci_irq_fixup		= maple_pci_irq_fixup,

	.pci_get_legacy_ide_irq	= maple_pci_get_legacy_ide_irq,

	.restart		= maple_restart,

	.halt			= maple_halt,

	.get_boot_time		= maple_get_boot_time,

	.set_rtc_time		= maple_set_rtc_time,

	.get_rtc_time		= maple_get_rtc_time,

	.calibrate_decr		= generic_calibrate_decr,

	.progress		= maple_progress,

	.power_save		= power4_idle,

};