From b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Tue, 15 Aug 2023 13:51:28 +1000 Subject: netlink: Correctly calculate attribute length for address messages In nl_addr_get() and nl_addr_dup() we step the attributes attached to each RTM_NEWADDR message with a loop initialised with IFA_RTA() and RTM_PAYLOAD() macros. RTM_PAYLOAD(), however is for RTM_NEWROUTE messages (struct rtmsg), not RTM_NEWADDR messages (struct ifaddrmsg). Consequently it miscalculates the size and means we can skip some attributes. Switch to IFA_PAYLOAD() which we should be using here. Signed-off-by: David Gibson Signed-off-by: Stefano Brivio --- netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netlink.c b/netlink.c index ff44e13..69a5304 100644 --- a/netlink.c +++ b/netlink.c @@ -548,7 +548,7 @@ int nl_addr_get(int s, unsigned int ifi, sa_family_t af, if (ifa->ifa_index != ifi) continue; - for (rta = IFA_RTA(ifa), na = RTM_PAYLOAD(nh); RTA_OK(rta, na); + for (rta = IFA_RTA(ifa), na = IFA_PAYLOAD(nh); RTA_OK(rta, na); rta = RTA_NEXT(rta, na)) { if (rta->rta_type != IFA_ADDRESS) continue; @@ -677,7 +677,7 @@ int nl_addr_dup(int s_src, unsigned int ifi_src, ifa->ifa_index = ifi_dst; - for (rta = IFA_RTA(ifa), na = RTM_PAYLOAD(nh); RTA_OK(rta, na); + for (rta = IFA_RTA(ifa), na = IFA_PAYLOAD(nh); RTA_OK(rta, na); rta = RTA_NEXT(rta, na)) { if (rta->rta_type == IFA_LABEL) rta->rta_type = IFA_UNSPEC; -- cgit v1.2.3