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

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

Merge 4.19.282 into android-4.19-stable 



Changes in 4.19.282
	ARM: dts: rockchip: fix a typo error for rk3288 spdif node
	net: sched: sch_qfq: prevent slab-out-of-bounds in qfq_activate_agg
	virtio_net: bugfix overflow inside xdp_linearize_page()
	i40e: fix accessing vsi->active_filters without holding lock
	i40e: fix i40e_setup_misc_vector() error handling
	mlxfw: fix null-ptr-deref in mlxfw_mfa2_tlv_next()
	e1000e: Disable TSO on i219-LM card to increase speed
	f2fs: Fix f2fs_truncate_partial_nodes ftrace event
	Input: i8042 - add quirk for Fujitsu Lifebook A574/H
	selftests: sigaltstack: fix -Wuninitialized
	scsi: megaraid_sas: Fix fw_crash_buffer_show()
	scsi: core: Improve scsi_vpd_inquiry() checks
	net: dsa: b53: mmap: add phy ops
	s390/ptrace: fix PTRACE_GET_LAST_BREAK error handling
	xen/netback: use same error messages for same errors
	nilfs2: initialize unused bytes in segment summary blocks
	memstick: fix memory leak if card device is never registered
	x86/purgatory: Don't generate debug info for purgatory.ro
	Revert "ext4: fix use-after-free in ext4_xattr_set_entry"
	ext4: remove duplicate definition of ext4_xattr_ibody_inline_set()
	ext4: fix use-after-free in ext4_xattr_set_entry
	udp: Call inet6_destroy_sock() in setsockopt(IPV6_ADDRFORM).
	tcp/udp: Call inet6_destroy_sock() in IPv6 sk->sk_destruct().
	inet6: Remove inet6_destroy_sock() in sk->sk_prot->destroy().
	dccp: Call inet6_destroy_sock() via sk->sk_destruct().
	sctp: Call inet6_destroy_sock() via sk->sk_destruct().
	counter: 104-quad-8: Fix race condition between FLAG and CNTR reads
	iio: adc: at91-sama5d2_adc: fix an error code in at91_adc_allocate_trigger()
	ASN.1: Fix check for strdup() success
	Linux 4.19.282

Change-Id: I35a16e29f98aa10e00d1e37d717ac1d0793fb5ed
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0b856698 cdfda37a

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 281

SUBLEVEL = 282

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/rk3288.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ 
		status = "disabled";

	};



	spdif: sound@ff88b0000 {

	spdif: sound@ff8b0000 {

		compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";

		reg = <0x0 0xff8b0000 0x0 0x10000>;

		#sound-dai-cells = <0>;

arch/s390/kernel/ptrace.c

+2 −6
Original line number Diff line number Diff line
@@ -503,9 +503,7 @@ long arch_ptrace(struct task_struct *child, long request, 
		}

		return 0;

	case PTRACE_GET_LAST_BREAK:

		put_user(child->thread.last_break,

			 (unsigned long __user *) data);

		return 0;

		return put_user(child->thread.last_break, (unsigned long __user *)data);

	case PTRACE_ENABLE_TE:

		if (!MACHINE_HAS_TE)

			return -EIO;
@@ -857,9 +855,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
		}

		return 0;

	case PTRACE_GET_LAST_BREAK:

		put_user(child->thread.last_break,

			 (unsigned int __user *) data);

		return 0;

		return put_user(child->thread.last_break, (unsigned int __user *)data);

	}

	return compat_ptrace_request(child, request, addr, data);

}

arch/x86/purgatory/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ KCOV_INSTRUMENT := n 
# make up the standalone purgatory.ro



PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel

PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss

PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss -g0

PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) -DDISABLE_BRANCH_PROFILING



# Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That
@@ -56,6 +56,9 @@ CFLAGS_sha256.o += $(PURGATORY_CFLAGS) 
CFLAGS_REMOVE_string.o		+= $(PURGATORY_CFLAGS_REMOVE)

CFLAGS_string.o			+= $(PURGATORY_CFLAGS)



AFLAGS_REMOVE_setup-x86_$(BITS).o	+= -g -Wa,-gdwarf-2

AFLAGS_REMOVE_entry64.o			+= -g -Wa,-gdwarf-2



$(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE

		$(call if_changed,ld)

drivers/iio/adc/at91-sama5d2_adc.c

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *indio, 
	trig = devm_iio_trigger_alloc(&indio->dev, "%s-dev%d-%s", indio->name,

				      indio->id, trigger_name);

	if (!trig)

		return NULL;

		return ERR_PTR(-ENOMEM);



	trig->dev.parent = indio->dev.parent;

	iio_trigger_set_drvdata(trig, indio);