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

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

Merge 5.4.242 into android11-5.4-lts 



Changes in 5.4.242
	ARM: dts: rockchip: fix a typo error for rk3288 spdif node
	arm64: dts: meson-g12-common: specify full DMC range
	netfilter: br_netfilter: fix recent physdev match breakage
	regulator: fan53555: Explicitly include bits header
	net: sched: sch_qfq: prevent slab-out-of-bounds in qfq_activate_agg
	virtio_net: bugfix overflow inside xdp_linearize_page()
	netfilter: nf_tables: fix ifdef to also consider nf_tables=m
	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()
	bpf: Fix incorrect verifier pruning due to missing register precision taints
	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
	nvme-tcp: fix a possible UAF when failing to allocate an io queue
	xen/netback: use same error messages for same errors
	iio: light: tsl2772: fix reading proximity-diodes from device tree
	nilfs2: initialize unused bytes in segment summary blocks
	memstick: fix memory leak if card device is never registered
	mmc: sdhci_am654: Set HIGH_SPEED_ENA for SDR12 and SDR25
	MIPS: Define RUNTIME_DISCARD_EXIT in LD script
	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().
	xfs: fix forkoff miscalculation related to XFS_LITINO(mp)
	pwm: meson: Explicitly set .polarity in .get_state()
	iio: adc: at91-sama5d2_adc: fix an error code in at91_adc_allocate_trigger()
	ASN.1: Fix check for strdup() success
	Linux 5.4.242

Change-Id: Id72de17865bf93d2a6d39009fbc46cb3f8f7b6ca
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents da8b283c ea7862c5

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 241

SUBLEVEL = 242

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/rk3288.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -942,7 +942,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/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -1376,10 +1376,9 @@ 


			dmc: bus@38000 {

				compatible = "simple-bus";

				reg = <0x0 0x38000 0x0 0x400>;

				#address-cells = <2>;

				#size-cells = <2>;

				ranges = <0x0 0x0 0x0 0x38000 0x0 0x400>;

				ranges = <0x0 0x0 0x0 0x38000 0x0 0x2000>;



				canvas: video-lut@48 {

					compatible = "amlogic,canvas";

arch/mips/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 */

#define BSS_FIRST_SECTIONS *(.bss..swapper_pg_dir)



#define RUNTIME_DISCARD_EXIT



#include <asm-generic/vmlinux.lds.h>



#undef mips

arch/s390/kernel/ptrace.c

+2 −6
Original line number Diff line number Diff line
@@ -502,9 +502,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;
@@ -856,9 +854,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);

}