From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54108 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753257AbcFQPgW (ORCPT ); Fri, 17 Jun 2016 11:36:22 -0400 Subject: Patch "macsec: fix netlink attribute for key id" has been added to the 4.6-stable tree To: sd@queasysnail.net, davem@davemloft.net, gregkh@linuxfoundation.org Cc: , From: Date: Fri, 17 Jun 2016 08:36:20 -0700 Message-ID: <1466177780130145@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: 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 know about it. >>From foo@baz Fri Jun 17 08:34:39 PDT 2016 From: Sabrina Dubroca Date: Wed, 18 May 2016 13:34:40 +0200 Subject: macsec: fix netlink attribute for key id From: Sabrina Dubroca [ Upstream commit 1968a0b8b6ca088bc029bd99ee696f1aca4090d0 ] In my last commit I replaced MACSEC_SA_ATTR_KEYID by MACSEC_SA_ATTR_KEY. Fixes: 8acca6acebd0 ("macsec: key identifier is 128 bits, not 64") Signed-off-by: Sabrina Dubroca Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -1645,7 +1645,7 @@ static int macsec_add_rxsa(struct sk_buf if (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_buf return -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 sd@queasysnail.net are queue-4.6/macsec-fix-netlink-attribute-for-key-id.patch