From: Greg Kroah-Hartman <gregkh@google.com>
Date: Wed, 23 Mar 2022 08:21:10 +0000 (+0100)
Subject: Merge 4.14.273 into android-4.14-q
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=725a6e0a025bdb7bcbc465cb20a0219ff365c692;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge 4.14.273 into android-4.14-q

Changes in 4.14.273
	sctp: fix the processing for INIT chunk
	sctp: fix the processing for INIT_ACK chunk
	xfrm: Fix xfrm migrate issues when address family changes
	arm64: dts: rockchip: fix rk3399-puma eMMC HS400 signal integrity
	ARM: dts: rockchip: fix a typo on rk3288 crypto-controller
	MIPS: smp: fill in sibling and core maps earlier
	ARM: 9178/1: fix unmet dependency on BITREVERSE for HAVE_ARCH_BITREVERSE
	can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready
	atm: firestream: check the return value of ioremap() in fs_init()
	nl80211: Update bss channel on channel switch for P2P_CLIENT
	tcp: make tcp_read_sock() more robust
	sfc: extend the locking on mcdi->seqno
	kselftest/vm: fix tests build with old libc
	fs: sysfs_emit: Remove PAGE_SIZE alignment check
	efi: fix return value of __setup handlers
	net/packet: fix slab-out-of-bounds access in packet_recvmsg()
	atm: eni: Add check for dma_map_single
	net: handle ARPHRD_PIMREG in dev_is_mac_header_xmit()
	usb: gadget: rndis: prevent integer overflow in rndis_set_response()
	usb: gadget: Fix use-after-free bug by not setting udc->dev.driver
	Input: aiptek - properly check endpoint type
	perf symbols: Fix symbol size calculation condition
	Linux 4.14.273

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If784e20196d900ffe2926cd26e2d909ff17d76b4
---

725a6e0a025bdb7bcbc465cb20a0219ff365c692
diff --cc net/xfrm/xfrm_state.c
index 4226399a0944,2c17fbdd2366..6b17725e450c
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@@ -1427,11 -1420,7 +1427,8 @@@ static struct xfrm_state *xfrm_state_cl
  	}
  
  	memcpy(&x->mark, &orig->mark, sizeof(x->mark));
 +	memcpy(&x->props.smark, &orig->props.smark, sizeof(x->props.smark));
  
- 	if (xfrm_init_state(x) < 0)
- 		goto error;
- 
  	x->props.flags = orig->props.flags;
  	x->props.extra_flags = orig->props.extra_flags;