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

o consistently check strlcpy result

Browse Source 
o warn when we skip an interface because it's name is too long
This commit is contained in:
Sam Leffler 2007-02-27 17:11:18 +00:00
parent f2d619c8b1
commit e5f015499d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=167081
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/ifconfig/ifconfig.c
View File

@ -148,6 +148,7 @@ main(int argc, char *argv[])
char options[1024], *cp;
const char *ifname;
struct option *p;
size_t iflen;
all = downonly = uponly = namesonly = verbose = 0;
@ -239,7 +240,10 @@ main(int argc, char *argv[])
*/
if (argc > 0 && (strcmp(argv[0], "create") == 0 ||
strcmp(argv[0], "plumb") == 0)) {
(void) strlcpy(name, ifname, sizeof(name));
iflen = strlcpy(name, ifname, sizeof(name));
if (iflen >= sizeof(name))
errx(1, "%s: cloning name too long",
ifname);
ifconfig(argc, argv, NULL);
exit(0);
}
@ -274,8 +278,12 @@ main(int argc, char *argv[])
sdl = NULL;
if (cp != NULL && strcmp(cp, ifa->ifa_name) == 0)
continue;
if (strlcpy(name, ifa->ifa_name, sizeof(name)) >= sizeof(name))
iflen = strlcpy(name, ifa->ifa_name, sizeof(name));
if (iflen >= sizeof(name)) {
warnx("%s: interface name too long, skipping",
ifa->ifa_name);
continue;
}
cp = ifa->ifa_name;
if (downonly && (ifa->ifa_flags & IFF_UP) != 0)