From: Breno Leitao <leitao@debian.org>
To: "David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>, Simon Horman <horms@kernel.org>,
David Ahern <dsahern@kernel.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Breno Leitao <leitao@debian.org>
Subject: [PATCH net-next 8/9] mpls: Use nlmsg_payload in mpls_valid_getroute_req
Date: Fri, 11 Apr 2025 10:00:55 -0700 [thread overview]
Message-ID: <20250411-nlmsg-v1-8-ddd4e065cb15@debian.org> (raw)
In-Reply-To: <20250411-nlmsg-v1-0-ddd4e065cb15@debian.org>
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>
---
net/mpls/af_mpls.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index bf7cd290c2369..d536c97144e9d 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -2288,7 +2288,8 @@ static int mpls_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;
@@ -2298,7 +2299,6 @@ static int mpls_valid_getroute_req(struct sk_buff *skb,
return nlmsg_parse_deprecated(nlh, sizeof(*rtm), tb, RTA_MAX,
rtm_mpls_policy, extack);
- rtm = nlmsg_data(nlh);
if ((rtm->rtm_dst_len && rtm->rtm_dst_len != 20) ||
rtm->rtm_src_len || rtm->rtm_tos || rtm->rtm_table ||
rtm->rtm_protocol || rtm->rtm_scope || rtm->rtm_type) {
--
2.47.1
next prev parent reply other threads:[~2025-04-11 17:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-11 17:00 [PATCH net-next 0/9] net: Introduce nlmsg_payload helper Breno Leitao
2025-04-11 17:00 ` [PATCH net-next 1/9] netlink: " Breno Leitao
2025-04-11 21:12 ` Kuniyuki Iwashima
2025-04-11 23:01 ` Jakub Kicinski
2025-04-11 17:00 ` [PATCH net-next 2/9] neighbour: Use nlmsg_payload in neightbl_valid_dump_info Breno Leitao
2025-04-11 21:19 ` Kuniyuki Iwashima
2025-04-11 17:00 ` [PATCH net-next 3/9] neighbour: Use nlmsg_payload in neigh_valid_get_req Breno Leitao
2025-04-11 21:22 ` Kuniyuki Iwashima
2025-04-11 17:00 ` [PATCH net-next 4/9] rtnetlink: Use nlmsg_payload in valid_fdb_dump_strict Breno Leitao
2025-04-11 21:25 ` Kuniyuki Iwashima
2025-04-11 17:00 ` [PATCH net-next 5/9] mpls: Use nlmsg_payload in mpls_valid_fib_dump_req Breno Leitao
2025-04-11 21:28 ` Kuniyuki Iwashima
2025-04-11 17:00 ` [PATCH net-next 6/9] ipv6: Use nlmsg_payload in inet6_valid_dump_ifaddr_req Breno Leitao
2025-04-11 21:29 ` Kuniyuki Iwashima
2025-04-11 17:00 ` [PATCH net-next 7/9] ipv6: Use nlmsg_payload in inet6_rtm_valid_getaddr_req Breno Leitao
2025-04-11 21:33 ` Kuniyuki Iwashima
2025-04-11 17:00 ` Breno Leitao [this message]
2025-04-11 21:34 ` [PATCH net-next 8/9] mpls: Use nlmsg_payload in mpls_valid_getroute_req Kuniyuki Iwashima
2025-04-11 17:00 ` [PATCH net-next 9/9] net: fib_rules: Use nlmsg_payload in fib_valid_dumprule_req Breno Leitao
2025-04-11 21:38 ` Kuniyuki Iwashima
2025-04-14 12:03 ` Breno Leitao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250411-nlmsg-v1-8-ddd4e065cb15@debian.org \
--to=leitao@debian.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).