| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250706020333.658492-12-saeed@kernel.org>
Date: Sat, 5 Jul 2025 19:03:31 -0700
From: Saeed Mahameed <saeed@...nel.org>
To: "David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Eric Dumazet <edumazet@...gle.com>
Cc: Saeed Mahameed <saeedm@...dia.com>,
netdev@...r.kernel.org,
Tariq Toukan <tariqt@...dia.com>,
Gal Pressman <gal@...dia.com>,
Leon Romanovsky <leonro@...dia.com>,
Jiri Pirko <jiri@...dia.com>
Subject: [PATCH net-next V5 11/13] devlink: Throw extack messages on param value validation error
From: Saeed Mahameed <saeedm@...dia.com>
Centralize devlink param value data validation in one function and
fill corresponding extack error messages on validation error.
Reviewed-by: Jiri Pirko <jiri@...dia.com>
Signed-off-by: Saeed Mahameed <saeedm@...dia.com>
---
net/devlink/param.c | 84 ++++++++++++++++++++++++++++++++++++---------
1 file changed, 68 insertions(+), 16 deletions(-)
diff --git a/net/devlink/param.c b/net/devlink/param.c
index 2a222d1bf81c..7b6affea459e 100644
--- a/net/devlink/param.c
+++ b/net/devlink/param.c
@@ -422,45 +422,97 @@ devlink_param_type_get_from_info(struct genl_info *info,
return 0;
}
+static int
+devlink_param_value_validate(struct genl_info *info,
+ enum devlink_param_type type)
+{
+ struct netlink_ext_ack *extack = info->extack;
+ struct nlattr *param_data;
+ int len = 0;
+
+ if (type != DEVLINK_PARAM_TYPE_BOOL &&
+ GENL_REQ_ATTR_CHECK(info, DEVLINK_ATTR_PARAM_VALUE_DATA))
+ return -EINVAL;
+
+ param_data = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA];
+
+ /* bool is the only type that doesn't expect data*/
+ if (type == DEVLINK_PARAM_TYPE_BOOL) {
+ if (param_data && nla_len(param_data)) {
+ NL_SET_ERR_MSG_MOD(extack,
+ "Boolean parameter should not have data");
+ return -EINVAL;
+ }
+ return 0;
+ }
+
+ if (!param_data) {
+ NL_SET_ERR_MSG_MOD(extack, "Expected data, got none");
+ return -EINVAL;
+ }
+
+ len = nla_len(param_data);
+ switch (type) {
+ case DEVLINK_PARAM_TYPE_U8:
+ if (len == sizeof(u8))
+ return 0;
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Expected uint8, got %d bytes", len);
+ break;
+ case DEVLINK_PARAM_TYPE_U16:
+ if (len == sizeof(u16))
+ return 0;
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Expected uint16, got %d bytes", len);
+ break;
+ case DEVLINK_PARAM_TYPE_U32:
+ if (len == sizeof(u32))
+ return 0;
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Expected uint32, got %d bytes", len);
+ break;
+ case DEVLINK_PARAM_TYPE_STRING:
+ len = strnlen(nla_data(param_data), nla_len(param_data));
+
+ if (len < nla_len(param_data) &&
+ len < __DEVLINK_PARAM_MAX_STRING_VALUE)
+ return 0;
+ NL_SET_ERR_MSG_MOD(extack, "String too long");
+ break;
+ default:
+ NL_SET_ERR_MSG_FMT_MOD(extack,
+ "Not supported value type %d", type);
+ break;
+ }
+ return -EINVAL;
+}
+
static int
devlink_param_value_get_from_info(const struct devlink_param *param,
struct genl_info *info,
union devlink_param_value *value)
{
struct nlattr *param_data;
- int len;
- param_data = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA];
-
- if (param->type != DEVLINK_PARAM_TYPE_BOOL && !param_data)
+ if (devlink_param_value_validate(info, param->type))
return -EINVAL;
+ param_data = info->attrs[DEVLINK_ATTR_PARAM_VALUE_DATA];
+
switch (param->type) {
case DEVLINK_PARAM_TYPE_U8:
- if (nla_len(param_data) != sizeof(u8))
- return -EINVAL;
value->vu8 = nla_get_u8(param_data);
break;
case DEVLINK_PARAM_TYPE_U16:
- if (nla_len(param_data) != sizeof(u16))
- return -EINVAL;
value->vu16 = nla_get_u16(param_data);
break;
case DEVLINK_PARAM_TYPE_U32:
- if (nla_len(param_data) != sizeof(u32))
- return -EINVAL;
value->vu32 = nla_get_u32(param_data);
break;
case DEVLINK_PARAM_TYPE_STRING:
- len = strnlen(nla_data(param_data), nla_len(param_data));
- if (len == nla_len(param_data) ||
- len >= __DEVLINK_PARAM_MAX_STRING_VALUE)
- return -EINVAL;
strcpy(value->vstr, nla_data(param_data));
break;
case DEVLINK_PARAM_TYPE_BOOL:
- if (param_data && nla_len(param_data))
- return -EINVAL;
value->vbool = nla_get_flag(param_data);
break;
}
--
2.50.0
Powered by blists - more mailing lists