ipv6: Use nlmsg_payload in addrconf 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-2-a1c75d493fd7@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 4af276179542833c266e6c1db0b3663bfe773454..ec6c4ca6d6d990d3c9dd91fcf44684de05262780 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -6112,7 +6112,8 @@ static int inet6_valid_dump_ifinfo(const struct nlmsghdr *nlh,
 {
        struct ifinfomsg *ifm;
 
-       if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*ifm))) {
+       ifm = nlmsg_payload(nlh, sizeof(*ifm));
+       if (!ifm) {
                NL_SET_ERR_MSG_MOD(extack, "Invalid header for link dump request");
                return -EINVAL;
        }
@@ -6122,7 +6123,6 @@ static int inet6_valid_dump_ifinfo(const struct nlmsghdr *nlh,
                return -EINVAL;
        }
 
-       ifm = nlmsg_data(nlh);
        if (ifm->__ifi_pad || ifm->ifi_type || ifm->ifi_flags ||
            ifm->ifi_change || ifm->ifi_index) {
                NL_SET_ERR_MSG_MOD(extack, "Invalid values in header for dump request");