aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBreno Leitao <leitao@debian.org>2025-04-15 12:28:54 -0700
committerJakub Kicinski <kuba@kernel.org>2025-04-16 18:33:02 -0700
commitbc05add844fc47ab61499d64a1128abf2ff77ea2 (patch)
tree01bb711b1ab416f598b836f4d1e1ecb525dbe7b2
parentipv6: Use nlmsg_payload in addrconf file (diff)
downloadwireguard-linux-bc05add844fc47ab61499d64a1128abf2ff77ea2.tar.xz
wireguard-linux-bc05add844fc47ab61499d64a1128abf2ff77ea2.zip
ipv6: Use nlmsg_payload in route file
Leverage the new nlmsg_payload() helper to avoid checking for message size and then reading the nlmsg data. Signed-off-by: Breno Leitao <leitao@debian.org> Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com> Link: https://patch.msgid.link/20250415-nlmsg_v2-v1-3-a1c75d493fd7@debian.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--net/ipv6/route.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 210b84cecc24..e2c6c0b0684b 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -6029,7 +6029,8 @@ static int inet6_rtm_valid_getroute_req(struct sk_buff *skb,
struct rtmsg *rtm;
int i, err;
- if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) {
+ rtm = nlmsg_payload(nlh, sizeof(*rtm));
+ if (!rtm) {
NL_SET_ERR_MSG_MOD(extack,
"Invalid header for get route request");
return -EINVAL;
@@ -6039,7 +6040,6 @@ static int inet6_rtm_valid_getroute_req(struct sk_buff *skb,
return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
rtm_ipv6_policy, extack);
- rtm = nlmsg_data(nlh);
if ((rtm->rtm_src_len && rtm->rtm_src_len != 128) ||
(rtm->rtm_dst_len && rtm->rtm_dst_len != 128) ||
rtm->rtm_table || rtm->rtm_protocol || rtm->rtm_scope ||