]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
macsec: replace custom checks on IFLA_MACSEC_ICV_LEN with NLA_POLICY_RANGE
authorSabrina Dubroca <sd@queasysnail.net>
Tue, 26 Aug 2025 13:16:27 +0000 (15:16 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 28 Aug 2025 01:34:53 +0000 (18:34 -0700)
The existing checks already force this range.

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

index 463fd9650b31791fe0a8cf77375800667e69e1ea..9589e8f9a8c9d5f2b6e89b0e3e9bbce9aeaeddba 100644 (file)
@@ -3760,7 +3760,7 @@ static const struct device_type macsec_type = {
 static const struct nla_policy macsec_rtnl_policy[IFLA_MACSEC_MAX + 1] = {
        [IFLA_MACSEC_SCI] = { .type = NLA_U64 },
        [IFLA_MACSEC_PORT] = { .type = NLA_U16 },
-       [IFLA_MACSEC_ICV_LEN] = { .type = NLA_U8 },
+       [IFLA_MACSEC_ICV_LEN] = NLA_POLICY_RANGE(NLA_U8, MACSEC_MIN_ICV_LEN, MACSEC_STD_ICV_LEN),
        [IFLA_MACSEC_CIPHER_SUITE] = { .type = NLA_U64 },
        [IFLA_MACSEC_WINDOW] = { .type = NLA_U32 },
        [IFLA_MACSEC_ENCODING_SA] = { .type = NLA_U8 },
@@ -4260,9 +4260,6 @@ static int macsec_validate_attr(struct nlattr *tb[], struct nlattr *data[],
        case MACSEC_CIPHER_ID_GCM_AES_XPN_128:
        case MACSEC_CIPHER_ID_GCM_AES_XPN_256:
        case MACSEC_DEFAULT_CIPHER_ID:
-               if (icv_len < MACSEC_MIN_ICV_LEN ||
-                   icv_len > MACSEC_STD_ICV_LEN)
-                       return -EINVAL;
                break;
        default:
                return -EINVAL;