d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In rtadvd, interface lookup calls if_indextoname() many times in a loop,

Browse Source 
(it takes a long time on systems with many interfaces)
without reason and without checking its return value.

Reviewed by: cem
Obtained from: Maryse Levavasseur <maryse.levavasseur@stormshield.eu>
MFC after: 1 month
Sponsored by: Stormshield
Differential Revision: https://reviews.freebsd.org/D6979
This commit is contained in:
Fabien Thomas 2016-11-02 15:11:23 +00:00
parent 7846f73cc8
commit 5ffb56f057
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/rtadvd/if.c
View File

@ -470,11 +470,18 @@ update_ifinfo(struct ifilist_head_t *ifi_head, int ifindex)
ifindex != ifm->ifm_index)
continue;
/* ifname */
if (if_indextoname(ifm->ifm_index, ifname) == NULL) {
syslog(LOG_WARNING,
"<%s> ifname not found (idx=%d)",
__func__, ifm->ifm_index);
continue;
}
/* lookup an entry with the same ifindex */
TAILQ_FOREACH(ifi, ifi_head, ifi_next) {
if (ifm->ifm_index == ifi->ifi_ifindex)
break;
if_indextoname(ifm->ifm_index, ifname);
if (strncmp(ifname, ifi->ifi_ifname,
sizeof(ifname)) == 0)
break;
@ -493,15 +500,7 @@ update_ifinfo(struct ifilist_head_t *ifi_head, int ifindex)
ifi->ifi_ifindex = ifm->ifm_index;
/* ifname */
if_indextoname(ifm->ifm_index, ifi->ifi_ifname);
if (ifi->ifi_ifname == NULL) {
syslog(LOG_WARNING,
"<%s> ifname not found (idx=%d)",
__func__, ifm->ifm_index);
if (ifi_new)
free(ifi);
continue;
}
strlcpy(ifi->ifi_ifname, ifname, IFNAMSIZ);
if ((s = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
syslog(LOG_ERR,