diff options
| author |   schwarze <schwarze@openbsd.org> | 2014-10-18 15:46:16 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2014-10-18 15:46:16 +0000 |
| commit | a53fa1e14206fe05601d72d13d95691afbb4e8f8 (patch) | |
| tree | 18109040826fed7e5a00eaa44cae146c60c02038 | |
| parent | oops, too greedy (diff) | |
| download | wireguard-openbsd-a53fa1e14206fe05601d72d13d95691afbb4e8f8.tar.xz wireguard-openbsd-a53fa1e14206fe05601d72d13d95691afbb4e8f8.zip | |
plug file descriptor leaks on read or write failure;
hinted at by Steffen Nurpmeso <sdaoden at yandex dot com>.
| -rw-r--r-- | usr.bin/mandoc/main.c | 9 | ||||
| -rw-r--r-- | usr.bin/mandoc/read.c | 22 |
2 files changed, 15 insertions, 16 deletions
diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c index 09af1dbadc6..84a63616ba7 100644 --- a/usr.bin/mandoc/main.c +++ b/usr.bin/mandoc/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.100 2014/09/03 23:20:33 schwarze Exp $ */ +/* $OpenBSD: main.c,v 1.101 2014/10/18 15:46:16 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -564,14 +564,15 @@ passthrough(const char *file, int fd) for (off = 0; off < nr; off += nw) if ((nw = write(STDOUT_FILENO, buf + off, (size_t)(nr - off))) == -1 || nw == 0) { + close(fd); syscall = "write"; goto fail; } - if (nr == 0) { - close(fd); + close(fd); + + if (nr == 0) return(MANDOCLEVEL_OK); - } syscall = "read"; fail: diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c index 077bdcebeab..2ca7b519723 100644 --- a/usr.bin/mandoc/read.c +++ b/usr.bin/mandoc/read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: read.c,v 1.66 2014/10/12 19:10:56 schwarze Exp $ */ +/* $OpenBSD: read.c,v 1.67 2014/10/18 15:46:16 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> @@ -747,7 +747,7 @@ mparse_readfd(struct mparse *curp, int fd, const char *file) (*curp->mmsg)(MANDOCERR_SYSOPEN, curp->file_status, file, 0, 0, strerror(errno)); - goto out; + return(curp->file_status); } /* @@ -757,19 +757,17 @@ mparse_readfd(struct mparse *curp, int fd, const char *file) * the parse phase for the file. */ - if ( ! read_whole_file(curp, file, fd, &blk, &with_mmap)) - goto out; - - mparse_parse_buffer(curp, blk, file); - - if (with_mmap) - munmap(blk.buf, blk.sz); - else - free(blk.buf); + if (read_whole_file(curp, file, fd, &blk, &with_mmap)) { + mparse_parse_buffer(curp, blk, file); + if (with_mmap) + munmap(blk.buf, blk.sz); + else + free(blk.buf); + } if (STDIN_FILENO != fd && -1 == close(fd)) perror(file); -out: + return(curp->file_status); } |