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

Fix a bug in cp += SA_SIZE() in RTA_* loop. This could prevent

Browse Source 
RTA_IFP from displaying correctly in route get subcommand.

Spotted by:	dim
This commit is contained in:
hrs 2013-07-24 04:05:48 +00:00
parent 565fb1612f
commit 512fdf0a5e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sbin/route/route.c
View File

@ -1699,16 +1699,15 @@ print_getmsg(struct rt_msghdr *rtm, int msglen, int fib)
return; return;
} }
cp = ((char *)(rtm + 1)); cp = ((char *)(rtm + 1));
for (i = 0; i < RTAX_MAX; i++) { for (i = 0; i < RTAX_MAX; i++)
if (rtm->rtm_addrs & (1 << i)) if (rtm->rtm_addrs & (1 << i)) {
sp[i] = (struct sockaddr *)cp; sp[i] = (struct sockaddr *)cp;
cp += SA_SIZE((struct sockaddr *)cp); cp += SA_SIZE((struct sockaddr *)cp);
} }
if (rtm->rtm_addrs & RTA_IFP) { if ((rtm->rtm_addrs & RTA_IFP) &&
if (sp[RTAX_IFP]->sa_family != AF_LINK || (sp[RTAX_IFP]->sa_family != AF_LINK ||
((struct sockaddr_dl *)(void *)sp[RTAX_IFP])->sdl_nlen == 0) ((struct sockaddr_dl *)(void *)sp[RTAX_IFP])->sdl_nlen == 0))
sp[RTAX_IFP] = NULL; sp[RTAX_IFP] = NULL;
}
if (sp[RTAX_DST] && sp[RTAX_NETMASK]) if (sp[RTAX_DST] && sp[RTAX_NETMASK])
sp[RTAX_NETMASK]->sa_family = sp[RTAX_DST]->sa_family; /* XXX */ sp[RTAX_NETMASK]->sa_family = sp[RTAX_DST]->sa_family; /* XXX */
if (sp[RTAX_DST]) if (sp[RTAX_DST])