From bf0d1e087b1bb82407e1ec361ff4ecdd8c8698a1 Mon Sep 17 00:00:00 2001 From: Howard Chen Date: Thu, 13 May 2021 11:16:04 +0800 Subject: [PATCH] ANDROID: revert core of "xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume" The mentioned CL makes CtsnetTestCases fails on CtsNetTestCases:android.net.cts.IpSecManagerTest#testAesGcm128Tcp6 Bug: 186608065 Bug: 197517655 Test: CtsNetTestCases Change-Id: I65eb4e45623af5d6ff8ec634ac11aa039f5cceef Signed-off-by: Howard Chen Signed-off-by: Alistair Delva --- net/xfrm/xfrm_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 93e790d77217..0983c094f1b9 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -610,7 +610,7 @@ EXPORT_SYMBOL_GPL(xfrm_output_resume); static int xfrm_output2(struct net *net, struct sock *sk, struct sk_buff *skb) { - return xfrm_output_resume(sk, skb, 1); + return xfrm_output_resume(skb->sk, skb, 1); } static int xfrm_output_gso(struct net *net, struct sock *sk, struct sk_buff *skb)