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>,
kernel-team@meta.com, Kuniyuki Iwashima <kuniyu@amazon.com>
Subject: [PATCH net-next v2 02/10] neighbour: Use nlmsg_payload in neightbl_valid_dump_info
Date: Mon, 14 Apr 2025 06:24:08 -0700 [thread overview]
Message-ID: <20250414-nlmsg-v2-2-3d90cb42c6af@debian.org> (raw)
In-Reply-To: <20250414-nlmsg-v2-0-3d90cb42c6af@debian.org>
Update neightbl_valid_dump_info function to utilize the new
nlmsg_payload() helper function.
This change improves code clarity and safety by ensuring that the
Netlink message payload is properly validated before accessing its data.
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
---
net/core/neighbour.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index a07249b59ae1e..b6bc4836c6e45 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -2430,12 +2430,12 @@ static int neightbl_valid_dump_info(const struct nlmsghdr *nlh,
{
struct ndtmsg *ndtm;
- if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ndtm))) {
+ ndtm = nlmsg_payload(nlh, sizeof(*ndtm));
+ if (!ndtm) {
NL_SET_ERR_MSG(extack, "Invalid header for neighbor table dump request");
return -EINVAL;
}
- ndtm = nlmsg_data(nlh);
if (ndtm->ndtm_pad1 || ndtm->ndtm_pad2) {
NL_SET_ERR_MSG(extack, "Invalid values in header for neighbor table dump request");
return -EINVAL;
--
2.47.1
next prev parent reply other threads:[~2025-04-14 13:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 13:24 [PATCH net-next v2 00/10] net: Introduce nlmsg_payload helper Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 01/10] netlink: " Breno Leitao
2025-04-14 13:24 ` Breno Leitao [this message]
2025-04-14 13:24 ` [PATCH net-next v2 03/10] neighbour: Use nlmsg_payload in neigh_valid_get_req Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 04/10] rtnetlink: Use nlmsg_payload in valid_fdb_dump_strict Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 05/10] mpls: Use nlmsg_payload in mpls_valid_fib_dump_req Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 06/10] ipv6: Use nlmsg_payload in inet6_valid_dump_ifaddr_req Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 07/10] ipv6: Use nlmsg_payload in inet6_rtm_valid_getaddr_req Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 08/10] mpls: Use nlmsg_payload in mpls_valid_getroute_req Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 09/10] net: fib_rules: Use nlmsg_payload in fib_valid_dumprule_req Breno Leitao
2025-04-14 13:24 ` [PATCH net-next v2 10/10] net: fib_rules: Use nlmsg_payload in fib_{new,del}rule() Breno Leitao
2025-04-14 18:42 ` Kuniyuki Iwashima
2025-04-15 15:40 ` [PATCH net-next v2 00/10] net: Introduce nlmsg_payload helper patchwork-bot+netdevbpf
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=20250414-nlmsg-v2-2-3d90cb42c6af@debian.org \
--to=leitao@debian.org \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=kernel-team@meta.com \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.com \
--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