d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When opening a trace file, open O_NONBLOCK so that ktrace doesn't stall

Browse Source 
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
This commit is contained in:
Robert Watson 2006-03-14 19:32:03 +00:00
parent 945a519a23
commit 9e92c8d486
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=156715
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/ktrace/ktrace.c
View File

@ -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);