]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
macsec: replace custom checks on MACSEC_SA_ATTR_KEYID with NLA_POLICY_EXACT_LEN
authorSabrina Dubroca <sd@queasysnail.net>
Tue, 26 Aug 2025 13:16:22 +0000 (15:16 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 28 Aug 2025 01:34:52 +0000 (18:34 -0700)
The existing checks already specify that MACSEC_SA_ATTR_KEYID must
have length MACSEC_KEYID_LEN.

Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/c4c113328962aae4146183e7a27854e854c796fb.1756202772.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/macsec.c

index 4bff2c90ff49f25e31f257047fa0f6729b119f6f..1b59f2c6b393e3f195e99220a02d240d8cc91fa2 100644 (file)
@@ -1672,8 +1672,7 @@ static const struct nla_policy macsec_genl_sa_policy[NUM_MACSEC_SA_ATTR] = {
        [MACSEC_SA_ATTR_AN] = NLA_POLICY_MAX(NLA_U8, MACSEC_NUM_AN - 1),
        [MACSEC_SA_ATTR_ACTIVE] = NLA_POLICY_MAX(NLA_U8, 1),
        [MACSEC_SA_ATTR_PN] = NLA_POLICY_MIN_LEN(4),
-       [MACSEC_SA_ATTR_KEYID] = { .type = NLA_BINARY,
-                                  .len = MACSEC_KEYID_LEN, },
+       [MACSEC_SA_ATTR_KEYID] = NLA_POLICY_EXACT_LEN(MACSEC_KEYID_LEN),
        [MACSEC_SA_ATTR_KEY] = { .type = NLA_BINARY,
                                 .len = MACSEC_MAX_KEY_LEN, },
        [MACSEC_SA_ATTR_SSCI] = { .type = NLA_U32 },
@@ -1737,9 +1736,6 @@ static bool validate_add_rxsa(struct nlattr **attrs)
            nla_get_u64(attrs[MACSEC_SA_ATTR_PN]) == 0)
                return false;
 
-       if (nla_len(attrs[MACSEC_SA_ATTR_KEYID]) != MACSEC_KEYID_LEN)
-               return false;
-
        return true;
 }
 
@@ -1960,9 +1956,6 @@ static bool validate_add_txsa(struct nlattr **attrs)
        if (nla_get_u64(attrs[MACSEC_SA_ATTR_PN]) == 0)
                return false;
 
-       if (nla_len(attrs[MACSEC_SA_ATTR_KEYID]) != MACSEC_KEYID_LEN)
-               return false;
-
        return true;
 }