OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

getifaddrs: Don't return ifa entries with NULL names [BZ #21812] 

A lookup operation in map_newlink could turn into an insert because of
holes in the interface part of the map.  This leads to incorrectly set
the name of the interface to NULL when the interface is not present
for the address being processed (most likely because the interface was
added between the RTM_GETLINK and RTM_GETADDR calls to the kernel).
When such changes are detected by the kernel, it'll mark the dump as
"inconsistent" by setting NLM_F_DUMP_INTR flag on the next netlink
message.

This patch checks this condition and retries the whole operation.
Hopes are that next time the interface corresponding to the address
entry is present in the list and correct name is returned.
This commit is contained in:
Daniel Alvarez 2018-06-29 09:44:55 +02:00 committed by Florian Weimer
parent 0b11b6491c
commit c1f86a33ca
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2018-06-29 Daniel Alvarez <dalvarez@redhat.com>
Jakub Sitnicki <jkbs@redhat.com>
[BZ #21812]
* sysdeps/unix/sysv/linux/ifaddrs.c (getifaddrs_internal): Retry
on NLM_F_DUMP_INTR.
2018-06-28 Szabolcs Nagy <szabolcs.nagy@arm.com>
* manual/llio.texi: Remove spurious space.

8
sysdeps/unix/sysv/linux/ifaddrs.c
View File

@ -370,6 +370,14 @@ getifaddrs_internal (struct ifaddrs **ifap)
if ((pid_t) nlh->nlmsg_pid != nh.pid || nlh->nlmsg_seq != nlp->seq)
continue;
/* If the dump got interrupted, we can't rely on the results
so try again. */
if (nlh->nlmsg_flags & NLM_F_DUMP_INTR)
{
result = -EAGAIN;
goto exit_free;
}
if (nlh->nlmsg_type == NLMSG_DONE)
break; /* ok */