aboutgitcodebugslistschat
path: root/netlink.c
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2023-08-15 13:51:28 +1000
committerStefano Brivio <sbrivio@redhat.com>2023-08-16 08:10:02 +0200
commitb4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048 (patch)
tree3d397bebf0f0e015ff4532d1318bdd02d59822a0 /netlink.c
parent4b9f4c251344bf350454d0b9e9184ae663c39fc3 (diff)
downloadpasst-b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048.tar
passt-b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048.tar.gz
passt-b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048.tar.bz2
passt-b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048.tar.lz
passt-b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048.tar.xz
passt-b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048.tar.zst
passt-b4f8ffd5c4b9afee50bbc8b0003ee7d5d618d048.zip
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 <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'netlink.c')
-rw-r--r--netlink.c4
1 files 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;