diff options
| author |   gluk <gluk@openbsd.org> | 2001-04-05 00:50:07 +0000 |
|---|---|---|
| committer | gluk <gluk@openbsd.org> | 2001-04-05 00:50:07 +0000 |
| commit | 6a2b328aa0ddc2089590045ce20a9ff3b8d78bdd (patch) | |
| tree | 3c90ba485655a71f02a17b41a2e5c162f3ac29ad | |
| parent | clear+free keys,iv for rekeying. (diff) | |
| download | wireguard-openbsd-6a2b328aa0ddc2089590045ce20a9ff3b8d78bdd.tar.xz wireguard-openbsd-6a2b328aa0ddc2089590045ce20a9ff3b8d78bdd.zip | |
Fix:
- two overflow of static buffer by device name.
- one overflow of dynamic buffer.
| -rw-r--r-- | sbin/newfs/newfs.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sbin/newfs/newfs.c b/sbin/newfs/newfs.c index 07a1a3758a4..edd923fa778 100644 --- a/sbin/newfs/newfs.c +++ b/sbin/newfs/newfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: newfs.c,v 1.24 2001/04/04 22:06:39 gluk Exp $ */ +/* $OpenBSD: newfs.c,v 1.25 2001/04/05 00:50:07 gluk Exp $ */ /* $NetBSD: newfs.c,v 1.20 1996/05/16 07:13:03 thorpej Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)newfs.c 8.8 (Berkeley) 4/18/94"; #else -static char rcsid[] = "$OpenBSD: newfs.c,v 1.24 2001/04/04 22:06:39 gluk Exp $"; +static char rcsid[] = "$OpenBSD: newfs.c,v 1.25 2001/04/05 00:50:07 gluk Exp $"; #endif #endif /* not lint */ @@ -394,9 +394,11 @@ main(argc, argv) /* * No path prefix; try /dev/r%s then /dev/%s. */ - (void)sprintf(device, "%sr%s", _PATH_DEV, special); + (void)snprintf(device, sizeof(device), "%sr%s", + _PATH_DEV, special); if (stat(device, &st) == -1) - (void)sprintf(device, "%s%s", _PATH_DEV, special); + (void)snprintf(device, sizeof(device), "%s%s", + _PATH_DEV, special); special = device; } if (Nflag) { @@ -654,7 +656,8 @@ rewritelabel(s, fd, lp) /* * Make name for 'c' partition. */ - strcpy(specname, s); + strncpy(specname, s, sizeof(specname) - 1); + specname[sizeof(specname) - 1] = '\0'; cp = specname + strlen(specname) - 1; if (!isdigit(*cp)) *cp = 'c'; |