nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

netlink: fix policy dump for int with validation callback

Browse source 
Recent devlink change added validation of an integer value
via NLA_POLICY_VALIDATE_FN, for sparse enums. Handle this
in policy dump. We can't extract any info out of the callback,
so report only the type.

Fixes: 429ac62114 ("devlink: define enum for attr types of dynamic attributes")
Reported-by: syzbot+01eb26848144516e7f0a@syzkaller.appspotmail.com
Link: https://patch.msgid.link/20250509212751.1905149-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2025-05-09 14:27:51 -07:00
parent cc42263172
commit a96876057b
2 changed files with 11 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
include/net/netlink.h
View file

@ -321,7 +321,13 @@ enum nla_policy_validation {
* All other Unused - but note that it's a union * All other Unused - but note that it's a union
* *
* Meaning of `validate' field, use via NLA_POLICY_VALIDATE_FN: * Meaning of `validate' field, use via NLA_POLICY_VALIDATE_FN:
* NLA_U8, NLA_U16,
* NLA_U32, NLA_U64,
* NLA_S8, NLA_S16,
* NLA_S32, NLA_S64,
* NLA_MSECS,
* NLA_BINARY Validation function called for the attribute. * NLA_BINARY Validation function called for the attribute.
*
* All other Unused - but note that it's a union * All other Unused - but note that it's a union
* *
* Example: * Example:

5
net/netlink/policy.c
View file

@ -311,6 +311,8 @@ __netlink_policy_dump_write_attr(struct netlink_policy_dump_state *state,
NL_POLICY_TYPE_ATTR_PAD)) NL_POLICY_TYPE_ATTR_PAD))
goto nla_put_failure; goto nla_put_failure;
break; break;
} else if (pt->validation_type == NLA_VALIDATE_FUNCTION) {
break;
} }
nla_get_range_unsigned(pt, &range); nla_get_range_unsigned(pt, &range);
@ -340,6 +342,9 @@ __netlink_policy_dump_write_attr(struct netlink_policy_dump_state *state,
else else
type = NL_ATTR_TYPE_SINT; type = NL_ATTR_TYPE_SINT;
if (pt->validation_type == NLA_VALIDATE_FUNCTION)
break;
nla_get_range_signed(pt, &range); nla_get_range_signed(pt, &range);
if (nla_put_s64(skb, NL_POLICY_TYPE_ATTR_MIN_VALUE_S, if (nla_put_s64(skb, NL_POLICY_TYPE_ATTR_MIN_VALUE_S,