]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
macsec: don't put a NULL rxsa
authorSabrina Dubroca <sd@queasysnail.net>
Fri, 22 Apr 2016 09:28:03 +0000 (11:28 +0200)
committerDhaval Giani <dhaval.giani@oracle.com>
Mon, 16 Jan 2017 19:48:59 +0000 (14:48 -0500)
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>
drivers/net/macsec.c

index 3451e89c2a9a43e27bea544158d715835c5a0387..203b5eadf19792944660a70833a8f330167a7712 100644 (file)
@@ -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();