lkml.org 
[lkml]   [2016]   [Jun]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.6 07/81] macsec: fix netlink attribute for key id
    Date
    4.6-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sabrina Dubroca <sd@queasysnail.net>

    [ 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 <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 | 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]);

    \
     
     \ /
      Last update: 2016-06-23 01:41    [W:5.041 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site