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

ipv6: Use nlmsg_payload in addrlabel file

Browse source 
Leverage the new nlmsg_payload() helper to avoid checking for message
size and then reading the nlmsg data.

This changes function ip6addrlbl_valid_get_req() and
ip6addrlbl_valid_dump_req().

Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250415-nlmsg_v2-v1-1-a1c75d493fd7@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Breno Leitao 2025-04-15 12:28:52 -07:00 committed by Jakub Kicinski
parent da59ceed5a
commit 5ef4097ed1
1 changed files with 4 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
net/ipv6/addrlabel.c
View file

@ -473,12 +473,12 @@ static int ip6addrlbl_valid_dump_req(const struct nlmsghdr *nlh,
{ {
struct ifaddrlblmsg *ifal; struct ifaddrlblmsg *ifal;
if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifal))) { ifal = nlmsg_payload(nlh, sizeof(*ifal));
if (!ifal) {
NL_SET_ERR_MSG_MOD(extack, "Invalid header for address label dump request"); NL_SET_ERR_MSG_MOD(extack, "Invalid header for address label dump request");
return -EINVAL; return -EINVAL;
} }
ifal = nlmsg_data(nlh);
if (ifal->__ifal_reserved || ifal->ifal_prefixlen || if (ifal->__ifal_reserved || ifal->ifal_prefixlen ||
ifal->ifal_flags || ifal->ifal_index || ifal->ifal_seq) { ifal->ifal_flags || ifal->ifal_index || ifal->ifal_seq) {
NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for address label dump request"); NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for address label dump request");
@ -543,7 +543,8 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb,
struct ifaddrlblmsg *ifal; struct ifaddrlblmsg *ifal;
int i, err; int i, err;
if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifal))) { ifal = nlmsg_payload(nlh, sizeof(*ifal));
if (!ifal) {
NL_SET_ERR_MSG_MOD(extack, "Invalid header for addrlabel get request"); NL_SET_ERR_MSG_MOD(extack, "Invalid header for addrlabel get request");
return -EINVAL; return -EINVAL;
} }
@ -552,7 +553,6 @@ static int ip6addrlbl_valid_get_req(struct sk_buff *skb,
return nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb, return nlmsg_parse_deprecated(nlh, sizeof(*ifal), tb,
IFAL_MAX, ifal_policy, extack); IFAL_MAX, ifal_policy, extack);
ifal = nlmsg_data(nlh);
if (ifal->__ifal_reserved || ifal->ifal_flags || ifal->ifal_seq) { if (ifal->__ifal_reserved || ifal->ifal_flags || ifal->ifal_seq) {
NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for addrlabel get request"); NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for addrlabel get request");
return -EINVAL; return -EINVAL;