rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-25 18:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

IFCONFIG(8): Avoid write to const string

Browse Source
This commit is contained in:
Sebastian Huber 2013-10-31 09:51:36 +01:00
parent 56e9de90c7
commit 51c48bff4b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
freebsd/sbin/ifconfig/af_inet6.c
View File

@ -38,6 +38,7 @@ static const char rcsid[] =
#include <net/if.h> #include <net/if.h>
#include <err.h> #include <err.h>
#include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -338,12 +339,20 @@ in6_getprefix(const char *plen, int which)
} }
static void static void
in6_getaddr(const char *s, int which) in6_getaddr(const char *cs, int which)
{ {
struct sockaddr_in6 *sin = sin6tab[which]; struct sockaddr_in6 *sin = sin6tab[which];
struct addrinfo hints, *res; struct addrinfo hints, *res;
int error = -1; int error = -1;
char s[64];
size_t slen = strlen(cs);
if (slen < sizeof(s) - 1 ) {
memcpy(s, cs, slen + 1);
} else {
error = ENAMETOOLONG;
goto done;
}
newaddr &= 1; newaddr &= 1;
sin->sin6_len = sizeof(*sin); sin->sin6_len = sizeof(*sin);
@ -364,9 +373,10 @@ in6_getaddr(const char *s, int which)
hints.ai_family = AF_INET6; hints.ai_family = AF_INET6;
error = getaddrinfo(s, NULL, &hints, &res); error = getaddrinfo(s, NULL, &hints, &res);
} }
done:
if (error != 0) { if (error != 0) {
if (inet_pton(AF_INET6, s, &sin->sin6_addr) != 1) if (inet_pton(AF_INET6, cs, &sin->sin6_addr) != 1)
errx(1, "%s: bad value", s); errx(1, "%s: bad value", cs);
} else } else
bcopy(res->ai_addr, sin, res->ai_addrlen); bcopy(res->ai_addr, sin, res->ai_addrlen);
} }