From 9e92c8d4866f5700c1b233ef7af8875a4a03f802 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Tue, 14 Mar 2006 19:32:03 +0000 Subject: [PATCH] When opening a trace file, open O_NONBLOCK so that ktrace doesn't stall if the target is a fifo. After opening a trace file, check that it is a regular file, and if not, return an error. MFC after: 3 days Reported by: kris PR: 94278 --- usr.bin/ktrace/ktrace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c index 4b8379614e6..84f10ee4472 100644 --- a/usr.bin/ktrace/ktrace.c +++ b/usr.bin/ktrace/ktrace.c @@ -145,11 +145,14 @@ main(int argc, char *argv[]) omask = umask(S_IRWXG|S_IRWXO); if (append) { - if ((fd = open(tracefile, O_CREAT | O_WRONLY, DEFFILEMODE)) < 0) + if ((fd = open(tracefile, O_CREAT | O_WRONLY | O_NONBLOCK, + DEFFILEMODE)) < 0) err(1, "%s", tracefile); if (fstat(fd, &sb) != 0 || sb.st_uid != getuid()) errx(1, "refuse to append to %s not owned by you", tracefile); + if (!(S_ISREG(sb.st_mode))) + errx(1, "%s not regular file", tracefile); } else { if (unlink(tracefile) == -1 && errno != ENOENT) err(1, "unlink %s", tracefile);