From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 3 Jul 2008 15:04:16 +0000 (+0000)
Subject:  r16689@tombo:  nickm | 2008-07-03 11:03:14 -0400
X-Git-Tag: tor-0.2.1.3-alpha~79
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d7a2d4eaeba63661e2c1bcac39c28d9dc79f25d;p=thirdparty%2Ftor.git

 r16689@tombo:  nickm | 2008-07-03 11:03:14 -0400
 Fix for bug 742: do not use O_CREAT on 2-option version of open().  Especially do not use it on /dev/null.  Fix from Michael Scherer. Bugfix on 0.0.2pre19 (wow).


svn:r15626
---

diff --git a/ChangeLog b/ChangeLog
index b7472e8950..59320bbb54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ Changes in version 0.2.1.3-alpha - 2008-07-xx
       "root:wheel". Fixes bug 676, reported by Serge Koksharov.
     - Fix macro collision between OpenSSL 0.9.8h and Windows headers.
       Fixes bug 704; fix from Steven Murdoch.
+    - When opening /dev/null in finish_daemonize(), do not pass the
+      O_CREAT flag.  Fortify was complaining, and correctly so.  Fixes
+      bug 742; fix from Michael Scherer.  Bugfix on 0.0.2pre19.
 
 
 Changes in version 0.2.1.2-alpha - 2008-06-20
diff --git a/src/common/util.c b/src/common/util.c
index 17962fc723..47d6aecd8c 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -3084,8 +3084,7 @@ finish_daemon(const char *desired_cwd)
     exit(1);
   }
 
-  nullfd = open("/dev/null",
-                O_CREAT | O_RDWR | O_APPEND);
+  nullfd = open("/dev/null", O_RDWR | O_APPEND);
   if (nullfd < 0) {
     log_err(LD_GENERAL,"/dev/null can't be opened. Exiting.");
     exit(1);