From: Thomas Rast <trast@inf.ethz.ch>
To: <git@vger.kernel.org>
Cc: "Dale R. Worley" <worley@alum.mit.edu>
Subject: [PATCH 2/2] run-command: dup_devnull(): guard against syscalls failing
Date: Fri, 12 Jul 2013 10:58:36 +0200 [thread overview]
Message-ID: <0f1e919ab5886d00d6956499cf5ed3e064033f11.1373618940.git.trast@inf.ethz.ch> (raw)
In-Reply-To: <cover.1373618940.git.trast@inf.ethz.ch>
dup_devnull() did not check the return values of open() and dup2().
Fix this omission.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
---
run-command.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/run-command.c b/run-command.c
index aece872..1b7f88e 100644
--- a/run-command.c
+++ b/run-command.c
@@ -76,7 +76,10 @@ static inline void close_pair(int fd[2])
static inline void dup_devnull(int to)
{
int fd = open("/dev/null", O_RDWR);
- dup2(fd, to);
+ if (fd < 0)
+ die_errno(_("open /dev/null failed"));
+ if (dup2(fd, to) < 0)
+ die_errno(_("dup2(%d,%d) failed"), fd, to);
close(fd);
}
#endif
--
1.8.3.2.998.g1d087bc
next prev parent reply other threads:[~2013-07-12 8:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-12 8:58 [PATCH 0/2] open() error checking Thomas Rast
2013-07-12 8:58 ` [PATCH 1/2] git_mkstemps: correctly test return value of open() Thomas Rast
2013-07-16 9:37 ` Thomas Rast
2013-07-17 19:29 ` Junio C Hamano
2013-07-18 12:32 ` Drew Northup
2013-07-18 17:46 ` Junio C Hamano
2013-07-18 17:47 ` Junio C Hamano
2013-07-18 20:32 ` Dale R. Worley
2013-07-18 20:49 ` Eric Sunshine
2013-07-18 20:54 ` Junio C Hamano
2013-07-18 22:46 ` Dale R. Worley
2013-07-18 23:23 ` Junio C Hamano
2013-07-18 23:29 ` Dale R. Worley
2013-07-12 8:58 ` Thomas Rast [this message]
2013-07-12 17:29 ` [PATCH 0/2] open() error checking Junio C Hamano
2013-07-16 9:25 ` Thomas Rast
2013-07-16 9:27 ` [PATCH 1/2] daemon/shell: refactor redirection of 0/1/2 from /dev/null Thomas Rast
2013-07-16 9:27 ` [PATCH 2/2] git: ensure 0/1/2 are open in main() Thomas Rast
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0f1e919ab5886d00d6956499cf5ed3e064033f11.1373618940.git.trast@inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=worley@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).