lkml.org 
[lkml]   [2022]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 42/69] macsec: fix error message in macsec_add_rxsa and _txsa
    Date
    From: Sabrina Dubroca <sd@queasysnail.net>

    [ Upstream commit 3240eac4ff20e51b87600dbd586ed814daf313db ]

    The expected length is MACSEC_SALT_LEN, not MACSEC_SA_ATTR_SALT.

    Fixes: 48ef50fa866a ("macsec: Netlink support of XPN cipher suites (IEEE 802.1AEbw)")
    Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/macsec.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
    index f72d4380374d..9ede0d7cd0b5 100644
    --- a/drivers/net/macsec.c
    +++ b/drivers/net/macsec.c
    @@ -1768,7 +1768,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info)
    if (nla_len(tb_sa[MACSEC_SA_ATTR_SALT]) != MACSEC_SALT_LEN) {
    pr_notice("macsec: nl: add_rxsa: bad salt length: %d != %d\n",
    nla_len(tb_sa[MACSEC_SA_ATTR_SALT]),
    - MACSEC_SA_ATTR_SALT);
    + MACSEC_SALT_LEN);
    rtnl_unlock();
    return -EINVAL;
    }
    @@ -2010,7 +2010,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info)
    if (nla_len(tb_sa[MACSEC_SA_ATTR_SALT]) != MACSEC_SALT_LEN) {
    pr_notice("macsec: nl: add_txsa: bad salt length: %d != %d\n",
    nla_len(tb_sa[MACSEC_SA_ATTR_SALT]),
    - MACSEC_SA_ATTR_SALT);
    + MACSEC_SALT_LEN);
    rtnl_unlock();
    return -EINVAL;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-01 14:07    [W:2.624 / U:1.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site