Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check arg count in configure() at entry, rather than later. 

This avoids the stupid null deref I added a couple of commits
ago (on bad usage) and also simplifies the rest of the routine
which no longer needs to check the arg count nearly as much.

Thanks to Alexander Nasonov for finding the null deref bug.
This commit is contained in:
kre 2018-05-09 13:19:33 +00:00
parent 301645f026
commit 99316b228e
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sbin/cgdconfig/cgdconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgdconfig.c,v 1.43 2018/05/06 20:55:42 kre Exp $ */ /* $NetBSD: cgdconfig.c,v 1.44 2018/05/09 13:19:33 kre Exp $ */
/*- /*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -33,7 +33,7 @@
#ifndef lint #ifndef lint
__COPYRIGHT("@(#) Copyright (c) 2002, 2003\ __COPYRIGHT("@(#) Copyright (c) 2002, 2003\
The NetBSD Foundation, Inc. All rights reserved."); The NetBSD Foundation, Inc. All rights reserved.");
__RCSID("$NetBSD: cgdconfig.c,v 1.43 2018/05/06 20:55:42 kre Exp $"); __RCSID("$NetBSD: cgdconfig.c,v 1.44 2018/05/09 13:19:33 kre Exp $");
#endif #endif
#include <err.h> #include <err.h>
@ -515,6 +515,15 @@ configure(int argc, char **argv, struct params *inparams, int flags)
char devicename[PATH_MAX]; char devicename[PATH_MAX];
const char *dev = NULL; /* XXX: gcc */ const char *dev = NULL; /* XXX: gcc */
if (argc < 2 || argc > 3) {
/* print usage and exit, only if called from main() */
if (flags == CONFIG_FLAGS_FROMMAIN) {
warnx("wrong number of args");
usage();
}
return -1;
}
if (( if ((
fd = opendisk1(*argv, O_RDWR, cgdname, sizeof(cgdname), 1, prog_open) fd = opendisk1(*argv, O_RDWR, cgdname, sizeof(cgdname), 1, prog_open)
) != -1) { ) != -1) {
@ -529,12 +538,10 @@ configure(int argc, char **argv, struct params *inparams, int flags)
prog_close(fd); prog_close(fd);
} }
if (argc == 2 || argc == 3) { dev = getfsspecname(devicename, sizeof(devicename), argv[1]);
dev = getfsspecname(devicename, sizeof(devicename), argv[1]); if (dev == NULL) {
if (dev == NULL) { warnx("getfsspecname failed: %s", devicename);
warnx("getfsspecname failed: %s", devicename); return -1;
return -1;
}
} }
if (argc == 2) { if (argc == 2) {
@ -543,16 +550,8 @@ configure(int argc, char **argv, struct params *inparams, int flags)
/* make string writable for basename */ /* make string writable for basename */
strlcpy(pfile, dev, sizeof(pfile)); strlcpy(pfile, dev, sizeof(pfile));
p = params_cget(basename(pfile)); p = params_cget(basename(pfile));
} else if (argc == 3) { } else
p = params_cget(argv[2]); p = params_cget(argv[2]);
} else {
/* print usage and exit, only if called from main() */
if (flags == CONFIG_FLAGS_FROMMAIN) {
warnx("wrong number of args");
usage();
}
return -1;
}
if (!p) if (!p)
return -1; return -1;