Patch "macsec: ensure rx_sa is set when validation is disabled" has been added to the 4.6-stable tree

This is a note to let you know that I've just added the patch titled

macsec: ensure rx_sa is set when validation is disabled

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
macsec-ensure-rx_sa-is-set-when-validation-is-disabled.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Beniamino Galvani <[email protected]>
Date: Tue, 26 Jul 2016 12:24:53 +0200
Subject: macsec: ensure rx_sa is set when validation is disabled

From: Beniamino Galvani <[email protected]>

[ Upstream commit e3a3b626010a14fe067f163c2c43409d5afcd2a9 ]

macsec_decrypt() is not called when validation is disabled and so macsec_skb_cb(skb)->rx_sa is not set; but it is used later in macsec_post_decrypt(), ensure that it's always initialized.

---
 drivers/net/macsec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

@@ -914,7 +914,6 @@ static struct sk_buff *macsec_decrypt(st
 	}
 
 	macsec_skb_cb(skb)->req = req;
-	macsec_skb_cb(skb)->rx_sa = rx_sa;
 	skb->dev = dev;
 	aead_request_set_callback(req, 0, macsec_decrypt_done, skb);
 

@@ -1141,6 +1140,8 @@ static rx_handler_result_t macsec_handle
 		}
 	}
 
+	macsec_skb_cb(skb)->rx_sa = rx_sa;
+
 	/* Disabled && !changed text => skip validation */
 	if (hdr->tci_an & MACSEC_TCI_C ||
 	    secy->validate_frames != MACSEC_VALIDATE_DISABLED)

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/macsec-ensure-rx_sa-is-set-when-validation-is-disabled.patch queue-4.6/bonding-set-carrier-off-for-devices-created-through-netlink.patch