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

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

Merge 5.4.276 into android11-5.4-lts 



Changes in 5.4.276
	dmaengine: pl330: issue_pending waits until WFP state
	dmaengine: Revert "dmaengine: pl330: issue_pending waits until WFP state"
	wifi: nl80211: don't free NULL coalescing rule
	pinctrl: core: delete incorrect free in pinctrl_enable()
	pinctrl: mediatek: Check gpio pin number and use binary search in mtk_hw_pin_field_lookup()
	pinctrl: mediatek: Supporting driving setting without mapping current to register value
	pinctrl: mediatek: Refine mtk_pinconf_get() and mtk_pinconf_set()
	pinctrl: mediatek: Refine mtk_pinconf_get()
	pinctrl: mediatek: Backward compatible to previous Mediatek's bias-pull usage
	pinctrl: mediatek: remove shadow variable declaration
	pinctrl: mediatek: paris: Fix PIN_CONFIG_BIAS_* readback
	pinctrl: mediatek: paris: Rework mtk_pinconf_{get,set} switch/case logic
	pinctrl: mediatek: paris: Rework support for PIN_CONFIG_{INPUT,OUTPUT}_ENABLE
	sunrpc: add a struct rpc_stats arg to rpc_create_args
	nfs: expose /proc/net/sunrpc/nfs in net namespaces
	nfs: make the rpc_stat per net namespace
	nfs: Handle error of rpc_proc_register() in nfs_net_init().
	power: rt9455: hide unused rt9455_boost_voltage_values
	pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map()
	s390/mm: Fix storage key clearing for guest huge pages
	s390/mm: Fix clearing storage keys for huge pages
	bna: ensure the copied buf is NUL terminated
	nsh: Restore skb->{protocol,data,mac_header} for outer header in nsh_gso_segment().
	net l2tp: drop flow hash on forward
	net: qede: use return from qede_parse_flow_attr() for flow_spec
	net: dsa: mv88e6xxx: Add number of MACs in the ATU
	net: dsa: mv88e6xxx: Fix number of databases for 88E6141 / 88E6341
	net: bridge: fix multicast-to-unicast with fraglist GSO
	tipc: fix a possible memleak in tipc_buf_append
	clk: sunxi-ng: h6: Reparent CPUX during PLL CPUX rate change
	scsi: lpfc: Update lpfc_ramp_down_queue_handler() logic
	gfs2: Fix invalid metadata access in punch_hole
	wifi: mac80211: fix ieee80211_bss_*_flags kernel-doc
	wifi: cfg80211: fix rdev_dump_mpp() arguments order
	net: mark racy access on sk->sk_rcvbuf
	scsi: bnx2fc: Remove spin_lock_bh while releasing resources after upload
	ALSA: line6: Zero-initialize message buffers
	net: bcmgenet: Reset RBUF on first open
	ata: sata_gemini: Check clk_enable() result
	firewire: ohci: mask bus reset interrupts between ISR and bottom half
	tools/power turbostat: Fix added raw MSR output
	tools/power turbostat: Fix Bzy_MHz documentation typo
	btrfs: make btrfs_clear_delalloc_extent() free delalloc reserve
	btrfs: always clear PERTRANS metadata during commit
	scsi: target: Fix SELinux error when systemd-modules loads the target module
	gpu: host1x: Do not setup DMA for virtual devices
	MIPS: scall: Save thread_info.syscall unconditionally on entry
	selftests: timers: Fix valid-adjtimex signed left-shift undefined behavior
	fs/9p: only translate RWX permissions for plain 9P2000
	fs/9p: translate O_TRUNC into OTRUNC
	9p: explicitly deny setlease attempts
	gpio: wcove: Use -ENOTSUPP consistently
	gpio: crystalcove: Use -ENOTSUPP consistently
	clk: Don't hold prepare_lock when calling kref_put()
	fs/9p: drop inodes immediately on non-.L too
	net:usb:qmi_wwan: support Rolling modules
	pinctrl: mediatek: Fix fallback call path
	xfrm: Preserve vlan tags for transport mode software GRO
	tcp: defer shutdown(SEND_SHUTDOWN) for TCP_SYN_RECV sockets
	tcp: Use refcount_inc_not_zero() in tcp_twsk_unique().
	Bluetooth: Fix use-after-free bugs caused by sco_sock_timeout
	Bluetooth: l2cap: fix null-ptr-deref in l2cap_chan_timeout
	rtnetlink: Correct nested IFLA_VF_VLAN_LIST attribute validation
	phonet: fix rtm_phonet_notify() skb allocation
	net: bridge: fix corrupted ethernet header on multicast-to-unicast
	ipv6: fib6_rules: avoid possible NULL dereference in fib6_rule_action()
	net: qede: sanitize 'rc' in qede_add_tc_flower_fltr()
	net: qede: use return from qede_parse_flow_attr() for flower
	firewire: nosy: ensure user_length is taken into account when fetching packet contents
	usb: gadget: composite: fix OS descriptors w_value logic
	usb: gadget: f_fs: Fix a race condition when processing setup packets.
	tipc: fix UAF in error path
	dyndbg: fix old BUG_ON in >control parser
	drm/vmwgfx: Fix invalid reads in fence signaled events
	net: fix out-of-bounds access in ops_init
	regulator: core: fix debugfs creation regression
	pinctrl: mediatek: Fix fallback behavior for bias_set_combo
	pinctrl: mediatek: Fix some off by one bugs
	pinctrl: mediatek: remove set but not used variable 'e'
	pinctrl: mediatek: paris: Fix PIN_CONFIG_INPUT_SCHMITT_ENABLE readback
	Linux 5.4.276

Change-Id: Ied32380a46975c946419ee289430c9226038578a
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b9e6f923 24d2be37

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 275

SUBLEVEL = 276

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/mips/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static inline long regs_return_value(struct pt_regs *regs) 
#define instruction_pointer(regs) ((regs)->cp0_epc)

#define profile_pc(regs) instruction_pointer(regs)



extern asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall);

extern asmlinkage long syscall_trace_enter(struct pt_regs *regs);

extern asmlinkage void syscall_trace_leave(struct pt_regs *regs);



extern void die(const char *, struct pt_regs *) __noreturn;

arch/mips/kernel/asm-offsets.c

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ void output_thread_info_defines(void) 
	OFFSET(TI_PRE_COUNT, thread_info, preempt_count);

	OFFSET(TI_ADDR_LIMIT, thread_info, addr_limit);

	OFFSET(TI_REGS, thread_info, regs);

	OFFSET(TI_SYSCALL, thread_info, syscall);

	DEFINE(_THREAD_SIZE, THREAD_SIZE);

	DEFINE(_THREAD_MASK, THREAD_MASK);

	DEFINE(_IRQ_STACK_SIZE, IRQ_STACK_SIZE);

arch/mips/kernel/ptrace.c

+6 −9
Original line number Diff line number Diff line
@@ -1399,16 +1399,13 @@ long arch_ptrace(struct task_struct *child, long request, 
 * Notification of system call entry/exit

 * - triggered by current->work.syscall_trace

 */

asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall)

asmlinkage long syscall_trace_enter(struct pt_regs *regs)

{

	user_exit();



	current_thread_info()->syscall = syscall;



	if (test_thread_flag(TIF_SYSCALL_TRACE)) {

		if (tracehook_report_syscall_entry(regs))

			return -1;

		syscall = current_thread_info()->syscall;

	}



#ifdef CONFIG_SECCOMP
@@ -1417,7 +1414,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) 
		struct seccomp_data sd;

		unsigned long args[6];



		sd.nr = syscall;

		sd.nr = current_thread_info()->syscall;

		sd.arch = syscall_get_arch(current);

		syscall_get_arguments(current, regs, args);

		for (i = 0; i < 6; i++)
@@ -1427,23 +1424,23 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) 
		ret = __secure_computing(&sd);

		if (ret == -1)

			return ret;

		syscall = current_thread_info()->syscall;

	}

#endif



	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))

		trace_sys_enter(regs, regs->regs[2]);



	audit_syscall_entry(syscall, regs->regs[4], regs->regs[5],

	audit_syscall_entry(current_thread_info()->syscall,

			    regs->regs[4], regs->regs[5],

			    regs->regs[6], regs->regs[7]);



	/*

	 * Negative syscall numbers are mistaken for rejected syscalls, but

	 * won't have had the return value set appropriately, so we do so now.

	 */

	if (syscall < 0)

	if (current_thread_info()->syscall < 0)

		syscall_set_return_value(current, regs, -ENOSYS, 0);

	return syscall;

	return current_thread_info()->syscall;

}



/*

arch/mips/kernel/scall32-o32.S

+13 −10
Original line number Diff line number Diff line
@@ -80,6 +80,18 @@ loads_done: 
	PTR	load_a7, bad_stack_a7

	.previous



	/*

	 * syscall number is in v0 unless we called syscall(__NR_###)

	 * where the real syscall number is in a0

	 */

	subu	t2, v0,  __NR_O32_Linux

	bnez	t2, 1f /* __NR_syscall at offset 0 */

	LONG_S	a0, TI_SYSCALL($28)	# Save a0 as syscall number

	b	2f

1:

	LONG_S	v0, TI_SYSCALL($28)	# Save v0 as syscall number

2:



	lw	t0, TI_FLAGS($28)	# syscall tracing enabled?

	li	t1, _TIF_WORK_SYSCALL_ENTRY

	and	t0, t1
@@ -117,16 +129,7 @@ syscall_trace_entry: 
	SAVE_STATIC

	move	a0, sp



	/*

	 * syscall number is in v0 unless we called syscall(__NR_###)

	 * where the real syscall number is in a0

	 */

	move	a1, v0

	subu	t2, v0,  __NR_O32_Linux

	bnez	t2, 1f /* __NR_syscall at offset 0 */

	lw	a1, PT_R4(sp)



1:	jal	syscall_trace_enter

	jal	syscall_trace_enter



	bltz	v0, 1f			# seccomp failed? Skip syscall