macsec: replace custom check on IFLA_MACSEC_ENCODING_SA with NLA_POLICY_MAX

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

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 115cdf347643aed85ca9012d08d34d7714f8f47f..316c5352ec2f45944e42be7a3c8793d54f15284c 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -3765,7 +3765,7 @@ static const struct nla_policy macsec_rtnl_policy[IFLA_MACSEC_MAX + 1] = {
        [IFLA_MACSEC_ICV_LEN] = NLA_POLICY_RANGE(NLA_U8, MACSEC_MIN_ICV_LEN, MACSEC_STD_ICV_LEN),
        [IFLA_MACSEC_CIPHER_SUITE] = NLA_POLICY_VALIDATE_FN(NLA_U64, validate_cipher_suite),
        [IFLA_MACSEC_WINDOW] = { .type = NLA_U32 },
-       [IFLA_MACSEC_ENCODING_SA] = { .type = NLA_U8 },
+       [IFLA_MACSEC_ENCODING_SA] = NLA_POLICY_MAX(NLA_U8, MACSEC_NUM_AN - 1),
        [IFLA_MACSEC_ENCRYPT] = NLA_POLICY_MAX(NLA_U8, 1),
        [IFLA_MACSEC_PROTECT] = NLA_POLICY_MAX(NLA_U8, 1),
        [IFLA_MACSEC_INC_SCI] = NLA_POLICY_MAX(NLA_U8, 1),
@@ -4266,11 +4266,6 @@ static int macsec_validate_attr(struct nlattr *tb[], struct nlattr *data[],
                }
        }
 
-       if (data[IFLA_MACSEC_ENCODING_SA]) {
-               if (nla_get_u8(data[IFLA_MACSEC_ENCODING_SA]) >= MACSEC_NUM_AN)
-                       return -EINVAL;
-       }
-
        es  = nla_get_u8_default(data[IFLA_MACSEC_ES], false);
        sci = nla_get_u8_default(data[IFLA_MACSEC_INC_SCI], false);
        scb = nla_get_u8_default(data[IFLA_MACSEC_SCB], false);