emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arp: fix buffer overflow. Closes 9071

Browse Source 
function                                             old     new   delta
arp_main                                            1910    1898     -12

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-07-04 17:38:01 +02:00
parent 44399e00ff
commit ee772a0d90
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/arp.c
View File

@ -178,7 +178,7 @@ static int arp_del(char **args)
if (flags == 0) if (flags == 0)
flags = 3; flags = 3;
strncpy(req.arp_dev, device, sizeof(req.arp_dev)); strncpy_IFNAMSIZ(req.arp_dev, device);
err = -1; err = -1;
@ -219,7 +219,7 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa)
struct ifreq ifr; struct ifreq ifr;
const struct hwtype *xhw; const struct hwtype *xhw;
strcpy(ifr.ifr_name, ifname); strncpy_IFNAMSIZ(ifr.ifr_name, ifname);
ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr, ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr,
"can't get HW-Address for '%s'", ifname); "can't get HW-Address for '%s'", ifname);
if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) { if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) {
@ -332,7 +332,7 @@ static int arp_set(char **args)
/* Fill in the remainder of the request. */ /* Fill in the remainder of the request. */
req.arp_flags = flags; req.arp_flags = flags;
strncpy(req.arp_dev, device, sizeof(req.arp_dev)); strncpy_IFNAMSIZ(req.arp_dev, device);
/* Call the kernel. */ /* Call the kernel. */
if (option_mask32 & ARP_OPT_v) if (option_mask32 & ARP_OPT_v)