[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20180104112507.GB6437@gondor.apana.org.au>
Date: Thu, 4 Jan 2018 22:25:07 +1100
From: Herbert Xu <herbert@...dor.apana.org.au>
To: Artem Savkov <asavkov@...hat.com>
Cc: Steffen Klassert <steffen.klassert@...unet.com>,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH v2] xfrm: Use __skb_queue_tail in xfrm_trans_queue
On Thu, Jan 04, 2018 at 12:20:26PM +0100, Artem Savkov wrote:
> Right, thats a better solution.
>
> Reported-and-tested-by: Artem Savkov <asavkov@...hat.com>
Thanks!
But I just realised that this patch is based on my dirty tree.
So here is a rebased version:
---8<---
We do not need locking in xfrm_trans_queue because it is designed
to use per-CPU buffers. However, the original code incorrectly
used skb_queue_tail which takes the lock. This patch switches
it to __skb_queue_tail instead.
Reported-and-tested-by: Artem Savkov <asavkov@...hat.com>
Fixes: acf568ee859f ("xfrm: Reinject transport-mode packets...")
Signed-off-by: Herbert Xu <herbert@...dor.apana.org.au>
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 444fa37..9dbf425 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -508,7 +508,7 @@ int xfrm_trans_queue(struct sk_buff *skb,
return -ENOBUFS;
XFRM_TRANS_SKB_CB(skb)->finish = finish;
- skb_queue_tail(&trans->queue, skb);
+ __skb_queue_tail(&trans->queue, skb);
tasklet_schedule(&trans->tasklet);
return 0;
}
--
Email: Herbert Xu <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Powered by blists - more mailing lists