From: Sabrina Dubroca Date: Tue, 26 Aug 2025 13:16:27 +0000 (+0200) Subject: macsec: replace custom checks on IFLA_MACSEC_ICV_LEN with NLA_POLICY_RANGE X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17882d23a6c68769d3fb7b45b2edaf637a58978c;p=thirdparty%2Fkernel%2Fstable.git macsec: replace custom checks on IFLA_MACSEC_ICV_LEN with NLA_POLICY_RANGE The existing checks already force this range. Signed-off-by: Sabrina Dubroca Reviewed-by: Simon Horman Link: https://patch.msgid.link/398cf16191a634ab343ecd811c481d7bdd44a933.1756202772.git.sd@queasysnail.net Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 463fd9650b317..9589e8f9a8c9d 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -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;