* Patch "macsec: ensure rx_sa is set when validation is disabled" has been added to the 4.6-stable tree
@ 2016-08-12 7:35 gregkh
0 siblings, 0 replies; only message in thread
From: gregkh @ 2016-08-12 7:35 UTC (permalink / raw)
To: bgalvani, davem, gregkh, sd; +Cc: stable, stable-commits
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 <stable@vger.kernel.org> know about it.
>From foo@baz Fri Aug 12 09:34:33 CEST 2016
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 26 Jul 2016 12:24:53 +0200
Subject: macsec: ensure rx_sa is set when validation is disabled
From: Beniamino Galvani <bgalvani@redhat.com>
[ 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.
Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver")
Signed-off-by: Beniamino Galvani <bgalvani@redhat.com>
Acked-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/net/macsec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -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 bgalvani@redhat.com 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-08-12 7:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-08-12 7:35 Patch "macsec: ensure rx_sa is set when validation is disabled" has been added to the 4.6-stable tree gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.