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

PR/23409: Geoff C. Wing: make sure we only print nul terminated strings.

Browse Source
This commit is contained in:
christos 2005-03-04 17:11:19 +00:00
parent cf31b04130
commit add06817f7
1 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
usr.bin/last/want.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: want.c,v 1.4 2004/11/19 21:41:25 christos Exp $ */ /* $NetBSD: want.c,v 1.5 2005/03/04 17:11:19 christos Exp $ */
/* /*
* Copyright (c) 1987, 1993, 1994 * Copyright (c) 1987, 1993, 1994
@ -32,13 +32,14 @@ static struct utmp *buf;
static void onintr(int); static void onintr(int);
static int want(struct utmp *, int); static int want(struct utmp *, int);
static const char *gethost(struct utmp *, int); static const char *gethost(struct utmp *, const char *, int);
static const char * static const char *
gethost(struct utmp* ut, int numeric) /*ARGSUSED*/
gethost(struct utmp *ut, const char *host, int numeric)
{ {
#if FIRSTVALID == 0 #if FIRSTVALID == 0
return numeric ? "" : ut->ut_host; return numeric ? "" : host;
#else #else
if (numeric) { if (numeric) {
static char buf[512]; static char buf[512];
@ -47,10 +48,17 @@ gethost(struct utmp* ut, int numeric)
(struct sockaddr *)&ut->ut_ss); (struct sockaddr *)&ut->ut_ss);
return buf; return buf;
} else } else
return ut->ut_host; return host;
#endif #endif
} }
#define NULTERM(what) \
if (check ## what) \
(void)strlcpy(what ## p = what ## buf, bp->ut_ ## what, \
sizeof(what ## buf)); \
else \
what ## p = bp->ut_ ## what
/* /*
* wtmp -- * wtmp --
* read through the wtmp file * read through the wtmp file
@ -66,6 +74,12 @@ wtmp(const char *file, int namesz, int linesz, int hostsz, int numeric)
int bytes, wfd; int bytes, wfd;
char *ct, *crmsg; char *ct, *crmsg;
size_t len = sizeof(*buf) * MAXUTMP; size_t len = sizeof(*buf) * MAXUTMP;
char namebuf[sizeof(bp->ut_name) + 1], *namep;
char linebuf[sizeof(bp->ut_line) + 1], *linep;
char hostbuf[sizeof(bp->ut_host) + 1], *hostp;
int checkname = namesz > sizeof(bp->ut_name);
int checkline = linesz > sizeof(bp->ut_line);
int checkhost = hostsz > sizeof(bp->ut_host);
if ((buf = malloc(len)) == NULL) if ((buf = malloc(len)) == NULL)
err(1, "Cannot allocate utmp buffer"); err(1, "Cannot allocate utmp buffer");
@ -85,24 +99,27 @@ wtmp(const char *file, int namesz, int linesz, int hostsz, int numeric)
(bytes = read(wfd, buf, len)) == -1) (bytes = read(wfd, buf, len)) == -1)
err(1, "%s", file); err(1, "%s", file);
for (bp = &buf[bytes / sizeof(*buf) - 1]; bp >= buf; --bp) { for (bp = &buf[bytes / sizeof(*buf) - 1]; bp >= buf; --bp) {
NULTERM(name);
NULTERM(line);
NULTERM(host);
/* /*
* if the terminal line is '~', the machine stopped. * if the terminal line is '~', the machine stopped.
* see utmp(5) for more info. * see utmp(5) for more info.
*/ */
if (bp->ut_line[0] == '~' && !bp->ut_line[1]) { if (linep[0] == '~' && !linep[1]) {
/* everybody just logged out */ /* everybody just logged out */
for (T = ttylist; T; T = T->next) for (T = ttylist; T; T = T->next)
T->logout = -bp->ut_timefld; T->logout = -bp->ut_timefld;
currentout = -bp->ut_timefld; currentout = -bp->ut_timefld;
crmsg = strncmp(bp->ut_name, "shutdown", crmsg = strncmp(namep, "shutdown",
namesz) ? "crash" : "shutdown"; namesz) ? "crash" : "shutdown";
if (want(bp, NO)) { if (want(bp, NO)) {
ct = fmttime(bp->ut_timefld, fulltime); ct = fmttime(bp->ut_timefld, fulltime);
printf("%-*.*s %-*.*s %-*.*s %s\n", printf("%-*.*s %-*.*s %-*.*s %s\n",
namesz, namesz, bp->ut_name, namesz, namesz, namep,
linesz, linesz, bp->ut_line, linesz, linesz, linep,
hostsz, hostsz, hostsz, hostsz,
gethost(bp, numeric), ct); gethost(bp, hostp, numeric), ct);
if (maxrec != -1 && !--maxrec) if (maxrec != -1 && !--maxrec)
return; return;
} }
@ -112,17 +129,14 @@ wtmp(const char *file, int namesz, int linesz, int hostsz, int numeric)
* if the line is '{' or '|', date got set; see * if the line is '{' or '|', date got set; see
* utmp(5) for more info. * utmp(5) for more info.
*/ */
if ((bp->ut_line[0] == '{' || bp->ut_line[0] == '|') if ((linep[0] == '{' || linep[0] == '|') && !linep[1]) {
&& !bp->ut_line[1]) {
if (want(bp, NO)) { if (want(bp, NO)) {
ct = fmttime(bp->ut_timefld, fulltime); ct = fmttime(bp->ut_timefld, fulltime);
printf("%-*.*s %-*.*s %-*.*s %s\n", printf("%-*.*s %-*.*s %-*.*s %s\n",
namesz, namesz, namesz, namesz, namep,
bp->ut_name, linesz, linesz, linep,
linesz, linesz,
bp->ut_line,
hostsz, hostsz, hostsz, hostsz,
gethost(bp, numeric), gethost(bp, hostp, numeric),
ct); ct);
if (maxrec && !--maxrec) if (maxrec && !--maxrec)
return; return;
@ -133,21 +147,21 @@ wtmp(const char *file, int namesz, int linesz, int hostsz, int numeric)
for (T = ttylist;; T = T->next) { for (T = ttylist;; T = T->next) {
if (!T) { if (!T) {
/* add new one */ /* add new one */
T = addtty(bp->ut_line); T = addtty(linep);
break; break;
} }
if (!strncmp(T->tty, bp->ut_line, LINESIZE)) if (!strncmp(T->tty, linep, LINESIZE))
break; break;
} }
if (TYPE(bp) == SIGNATURE) if (TYPE(bp) == SIGNATURE)
continue; continue;
if (bp->ut_name[0] && want(bp, YES)) { if (namep[0] && want(bp, YES)) {
ct = fmttime(bp->ut_timefld, fulltime); ct = fmttime(bp->ut_timefld, fulltime);
printf("%-*.*s %-*.*s %-*.*s %s ", printf("%-*.*s %-*.*s %-*.*s %s ",
namesz, namesz, bp->ut_name, namesz, namesz, namep,
linesz, linesz, bp->ut_line, linesz, linesz, linep,
hostsz, hostsz, hostsz, hostsz,
gethost(bp, numeric), gethost(bp, hostp, numeric),
ct); ct);
if (!T->logout) if (!T->logout)
puts(" still logged in"); puts(" still logged in");