moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 5.15.20 into android13-5.15

Browse Source 
Changes in 5.15.20
	PCI: pciehp: Fix infinite loop in IRQ handler upon power fault
	selftests: mptcp: fix ipv6 routing setup
	net: ipa: use a bitmap for endpoint replenish_enabled
	net: ipa: prevent concurrent replenish
	drm/vc4: hdmi: Make sure the device is powered with CEC
	cgroup-v1: Require capabilities to set release_agent
	Revert "mm/gup: small refactoring: simplify try_grab_page()"
	ovl: don't fail copy up if no fileattr support on upper
	lockd: fix server crash on reboot of client holding lock
	lockd: fix failure to cleanup client locks
	net/mlx5e: IPsec: Fix tunnel mode crypto offload for non TCP/UDP traffic
	net/mlx5: Bridge, take rtnl lock in init error handler
	net/mlx5: Bridge, ensure dev_name is null-terminated
	net/mlx5e: Fix handling of wrong devices during bond netevent
	net/mlx5: Use del_timer_sync in fw reset flow of halting poll
	net/mlx5e: Fix module EEPROM query
	net/mlx5: Fix offloading with ESWITCH_IPV4_TTL_MODIFY_ENABLE
	net/mlx5e: Don't treat small ceil values as unlimited in HTB offload
	net/mlx5: Bridge, Fix devlink deadlock on net namespace deletion
	net/mlx5: E-Switch, Fix uninitialized variable modact
	ipheth: fix EOVERFLOW in ipheth_rcvbulk_callback
	i40e: Fix reset bw limit when DCB enabled with 1 TC
	i40e: Fix reset path while removing the driver
	net: amd-xgbe: ensure to reset the tx_timer_active flag
	net: amd-xgbe: Fix skb data length underflow
	fanotify: Fix stale file descriptor in copy_event_to_user()
	net: sched: fix use-after-free in tc_new_tfilter()
	rtnetlink: make sure to refresh master_dev/m_ops in __rtnl_newlink()
	cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask()
	e1000e: Handshake with CSME starts from ADL platforms
	af_packet: fix data-race in packet_setsockopt / packet_setsockopt
	tcp: add missing tcp_skb_can_collapse() test in tcp_shift_skb_data()
	ovl: fix NULL pointer dereference in copy up warning
	Linux 5.15.20

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ia50333eff81881fac62eb52455b502e6c46ff3d9
This commit is contained in:
Greg Kroah-Hartman
2022-02-05 13:22:13 +01:00
parent 25dff3a609 8deae2f417
commit 344a3ff87c
29 changed files with 211 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/tcp_input.c
View File

@@ -1653,6 +1653,8 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
(mss != tcp_skb_seglen(skb)))
goto out;
if (!tcp_skb_can_collapse(prev, skb))
goto out;
len = skb->len;
pcount = tcp_skb_pcount(skb);
if (tcp_skb_shift(prev, skb, pcount, len))