diff options
| author | Philipp Buehler <pb@cvs.openbsd.org> | 2002-08-22 17:45:17 +0000 |
|---|---|---|
| committer | Philipp Buehler <pb@cvs.openbsd.org> | 2002-08-22 17:45:17 +0000 |
| commit | 21a853ee5713a8583eedacf655aabc75d888e454 (patch) | |
| tree | 90acc8ddc061da0f6183166107257fd8a62949dc | |
| parent | dbbfd7f309a55b8320c8d78ba6adc4a8c40be916 (diff) | |
fix int overflow in statbf.st_size, from netbsd PR#17933
as by request from deraadt@
| -rw-r--r-- | libexec/comsat/comsat.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 558345935ec..48273cc90f2 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: comsat.c,v 1.24 2002/07/03 23:39:03 deraadt Exp $ */ +/* $OpenBSD: comsat.c,v 1.25 2002/08/22 17:45:16 pb Exp $ */ /* * Copyright (c) 1980, 1993 @@ -41,9 +41,10 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)comsat.c 8.1 (Berkeley) 6/4/93";*/ -static char rcsid[] = "$OpenBSD: comsat.c,v 1.24 2002/07/03 23:39:03 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: comsat.c,v 1.25 2002/08/22 17:45:16 pb Exp $"; #endif /* not lint */ +#include <sys/limits.h> #include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> @@ -183,6 +184,11 @@ doreadutmp(void) (void)fstat(uf, &statbf); if (statbf.st_mtime > utmpmtime) { utmpmtime = statbf.st_mtime; + /* avoid int overflow */ + if (statbf.st_size > INT_MAX - 10 * sizeof(struct utmp)) { + syslog(LOG_ALERT, "utmp file excessively large"); + exit(1); + } if (statbf.st_size > utmpsize) { utmpsize = statbf.st_size + 10 * sizeof(struct utmp); if ((utmp = realloc(utmp, utmpsize)) == NULL) { |