Patch "macsec: fix netlink attribute for key id" has been added to the 4.6-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
macsec: fix netlink attribute for key id
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-fix-netlink-attribute-for-key-id.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.
Quoted 1 line
From foo@baz Fri Jun 17 08:34:39 PDT 2016
From: Sabrina Dubroca <[email protected]>
Date: Wed, 18 May 2016 13:34:40 +0200
Subject: macsec: fix netlink attribute for key id
From: Sabrina Dubroca <[email protected]>
[ Upstream commit 1968a0b8b6ca088bc029bd99ee696f1aca4090d0 ]
In my last commit I replaced MACSEC_SA_ATTR_KEYID by MACSEC_SA_ATTR_KEY.
--- drivers/net/macsec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/macsec.c +2 -2
@@ -1645,7 +1645,7 @@ static int macsec_add_rxsa(struct sk_bufif (tb_sa[MACSEC_SA_ATTR_ACTIVE ]) rx_sa->active = !!nla_get_u8 (tb_sa[MACSEC_SA_ATTR_ACTIVE ]); -nla_memcpy (rx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY ],MACSEC_KEYID_LEN ); +nla_memcpy (rx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEYID ],MACSEC_KEYID_LEN ); rx_sa->sc = rx_sc;rcu_assign_pointer (rx_sc->sa[assoc_num], rx_sa);
@@ -1784,7 +1784,7 @@ static int macsec_add_txsa(struct sk_bufreturn -ENOMEM ; } -nla_memcpy (tx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEY ],MACSEC_KEYID_LEN ); +nla_memcpy (tx_sa->key.id, tb_sa[MACSEC_SA_ATTR_KEYID ],MACSEC_KEYID_LEN );spin_lock_bh (&tx_sa->lock); tx_sa->next_pn =nla_get_u32 (tb_sa[MACSEC_SA_ATTR_PN ]);
Patches currently in stable-queue which might be from [email protected] are
queue-4.6/macsec-fix-netlink-attribute-for-key-id.patch