From: Sabrina Dubroca <sd@queasysnail.net>
Date: Fri, 22 Apr 2016 09:28:03 +0000 (+0200)
Subject: macsec: don't put a NULL rxsa
X-Git-Tag: v4.1.12-92~24^2~76
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=358e28bbf6ebba88f7ee84a316c55eaf33862dac;p=users%2Fjedix%2Flinux-maple.git

macsec: don't put a NULL rxsa

The "deliver:" path of macsec_handle_frame can be called with
rx_sa == NULL.  Check rx_sa != NULL before calling macsec_rxsa_put().

Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 497f358aa4c0d99b75ec204407389920d5e33ec5)

Orabug: 24614549

Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
---

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 3451e89c2a9a4..203b5eadf1979 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -1161,7 +1161,8 @@ deliver:
 			    macsec_extra_len(macsec_skb_cb(skb)->has_sci));
 	macsec_reset_skb(skb, secy->netdev);
 
-	macsec_rxsa_put(rx_sa);
+	if (rx_sa)
+		macsec_rxsa_put(rx_sa);
 	count_rx(dev, skb->len);
 
 	rcu_read_unlock();