qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netlink: fix policy dump for int with validation callback 

JIRA: https://issues.redhat.com/browse/RHEL-105064

commit a96876057b9e44f60d936f8e4887543555b0593c
Author: Jakub Kicinski <kuba@kernel.org>
Date:   Fri May 9 14:27:51 2025 -0700

    netlink: fix policy dump for int with validation callback

    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: 429ac6211494 ("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>

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
This commit is contained in:
Ivan Vecera 2025-07-23 11:17:54 +02:00
parent 6f93a30490
commit 62a9fc705b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/netlink.h
View File

@ -320,7 +320,13 @@ enum nla_policy_validation {
* All other Unused - but note that it's a union
*
* 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.
*
* All other Unused - but note that it's a union
*
* 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))
goto nla_put_failure;
break;
} else if (pt->validation_type == NLA_VALIDATE_FUNCTION) {
break;
}
nla_get_range_unsigned(pt, &range);
@ -340,6 +342,9 @@ __netlink_policy_dump_write_attr(struct netlink_policy_dump_state *state,
else
type = NL_ATTR_TYPE_SINT;
if (pt->validation_type == NLA_VALIDATE_FUNCTION)
break;
nla_get_range_signed(pt, &range);
if (nla_put_s64(skb, NL_POLICY_TYPE_ATTR_MIN_VALUE_S,