vdpa: Enable strict validation for netlink ops
Subsystems (2)
v2 cover vdpa: Enable strict validation for netlink ops
The original patch from Lin Ma enables the vdpa driver to use validation netlink ops.
The second patch simply disables the validation skip which is no longer neccesary. Patchset started of from this discussion [0].
[0] https://lore.kernel.org/virtualization/[email protected]/T/#t
v2: cc'ed stable
Dragos Tatulea (1):
vdpa: Enable strict validation for netlinks ops
Lin Ma (1):
vdpa: Complement vdpa_nl_policy for nlattr length check
drivers/vdpa/vdpa.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
Signature · 1 line
2.41.0
PATCH v2 1/2 vdpa: Complement vdpa_nl_policy for nlattr length check
Author: Lin Ma <[email protected]>
The vdpa_nl_policy structure is used to validate the nlattr when parsing the incoming nlmsg. It will ensure the attribute being described produces a valid nlattr pointer in info->attrs before entering into each handler in vdpa_nl_ops.
That is to say, the missing part in vdpa_nl_policy may lead to illegal nlattr after parsing, which could lead to OOB read just like CVE-2023-3773.
This patch adds three missing nla_policy to avoid such bugs.
--- drivers/vdpa/vdpa.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/vdpa/vdpa.c +3 -0
@@ -1247,8 +1247,11 @@ static const struct nla_policy vdpa_nl_policy[VDPA_ATTR_MAX + 1] = { [VDPA_ATTR_MGMTDEV_DEV_NAME] = { .type = NLA_STRING }, [VDPA_ATTR_DEV_NAME] = { .type = NLA_STRING }, [VDPA_ATTR_DEV_NET_CFG_MACADDR] = NLA_POLICY_ETH_ADDR, + [VDPA_ATTR_DEV_NET_CFG_MAX_VQP ] = { .type =NLA_U16 }, /* virtio spec 1.1 section 5.1.4.1 for valid MTU range */ [VDPA_ATTR_DEV_NET_CFG_MTU] = NLA_POLICY_MIN(NLA_U16, 68), + [VDPA_ATTR_DEV_QUEUE_INDEX] = { .type = NLA_U32 }, + [VDPA_ATTR_DEV_FEATURES] = { .type = NLA_U64 }, };static const struct genl_ops vdpa_nl_ops[] = {
Signature · 6 lines
2.41.0 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
kernel test robot
build botRe: [PATCH 1/2] vdpa: Complement vdpa_nl_policy for nlattr length check
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Rule: 'Cc: [email protected]' or 'commit <sha1> upstream.'
Subject: [PATCH 1/2] vdpa: Complement vdpa_nl_policy for nlattr length check
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v2 2/2 vdpa: Enable strict validation for netlinks ops
In reply to Dragos TatuleaThe previous patch added the missing nla policies that were required for validation to work.
Now strict validation on netlink ops can be enabled. This patch does it.
--- drivers/vdpa/vdpa.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/vdpa/vdpa.c +0 -6
@@ -1257,37 +1257,31 @@ static const struct nla_policy vdpa_nl_policy[VDPA_ATTR_MAX + 1] = {static const struct genl_ops vdpa_nl_ops[] = { { .cmd =VDPA_CMD_MGMTDEV_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_mgmtdev_get_doit, .dumpit = vdpa_nl_cmd_mgmtdev_get_dumpit, }, { .cmd =VDPA_CMD_DEV_NEW , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_add_set_doit, .flags =GENL_ADMIN_PERM , }, { .cmd =VDPA_CMD_DEV_DEL , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_del_set_doit, .flags =GENL_ADMIN_PERM , }, { .cmd =VDPA_CMD_DEV_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_get_doit, .dumpit = vdpa_nl_cmd_dev_get_dumpit, }, { .cmd =VDPA_CMD_DEV_CONFIG_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_config_get_doit, .dumpit = vdpa_nl_cmd_dev_config_get_dumpit, }, { .cmd =VDPA_CMD_DEV_VSTATS_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_stats_get_doit, .flags =GENL_ADMIN_PERM , },
Signature · 6 lines
2.41.0 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Greg KH
maintainerRe: [PATCH 2/2] vdpa: Enable strict validation for netlinks ops
Quoted 55 lines · Dragos Tatulea
The previous patch added the missing nla policies that were required for validation to work.
Now strict validation on netlink ops can be enabled. This patch does it.
Signed-off-by Dragos Tatulea <[email protected]>--- drivers/vdpa/vdpa.c | 6 ------ 1 file changed, 6 deletions(-)drivers/vdpa/vdpa.c +0
-6@@ -1257,37 +1257,31 @@ static const struct nla_policy vdpa_nl_policy[VDPA_ATTR_MAX + 1] = {static const struct genl_ops vdpa_nl_ops[] = { { .cmd =VDPA_CMD_MGMTDEV_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_mgmtdev_get_doit, .dumpit = vdpa_nl_cmd_mgmtdev_get_dumpit, }, { .cmd =VDPA_CMD_DEV_NEW , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_add_set_doit, .flags =GENL_ADMIN_PERM , }, { .cmd =VDPA_CMD_DEV_DEL , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_del_set_doit, .flags =GENL_ADMIN_PERM , }, { .cmd =VDPA_CMD_DEV_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_get_doit, .dumpit = vdpa_nl_cmd_dev_get_dumpit, }, { .cmd =VDPA_CMD_DEV_CONFIG_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_config_get_doit, .dumpit = vdpa_nl_cmd_dev_config_get_dumpit, }, { .cmd =VDPA_CMD_DEV_VSTATS_GET , - .validate =GENL_DONT_VALIDATE_STRICT |GENL_DONT_VALIDATE_DUMP , .doit = vdpa_nl_cmd_dev_stats_get_doit, .flags =GENL_ADMIN_PERM , },Signature · 1 line
2.41.0
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>