diff options
| author | Andreas Steinmetz <ast@domdv.de> | 2019-06-30 22:46:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-28 08:28:34 +0200 |
| commit | a5e9991ff901aecead1fad8e5d31abaa8ad79856 (patch) | |
| tree | ececf752af814ea726447fd7b5c2247cbf8a1d55 | |
| parent | 7edddedc3b87b9a2226893be6f94d06cf90d02c1 (diff) | |
| download | linux-stable-a5e9991ff901aecead1fad8e5d31abaa8ad79856.tar.gz linux-stable-a5e9991ff901aecead1fad8e5d31abaa8ad79856.tar.bz2 linux-stable-a5e9991ff901aecead1fad8e5d31abaa8ad79856.zip | |
macsec: fix use-after-free of skb during RX
[ Upstream commit 095c02da80a41cf6d311c504d8955d6d1c2add10 ]
Fix use-after-free of skb when rx_handler returns RX_HANDLER_PASS.
Signed-off-by: Andreas Steinmetz <ast@domdv.de>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/macsec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 64a982563d59..df86bcb7bc2e 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -1103,10 +1103,9 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) } skb = skb_unshare(skb, GFP_ATOMIC); - if (!skb) { - *pskb = NULL; + *pskb = skb; + if (!skb) return RX_HANDLER_CONSUMED; - } pulled_sci = pskb_may_pull(skb, macsec_extra_len(true)); if (!pulled_sci) { |