[or-cvs] r15628: Backport to 0.1.2: Fix for bug 742: do not use O_CREAT on 2- (in tor/branches/tor-0_1_2-patches: . src/common)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-07-03 11:04:51 -0400 (Thu, 03 Jul 2008)
New Revision: 15628

Modified:
   tor/branches/tor-0_1_2-patches/
   tor/branches/tor-0_1_2-patches/ChangeLog
   tor/branches/tor-0_1_2-patches/src/common/util.c
Log:
 r16691@tombo:  nickm | 2008-07-03 11:04:03 -0400
 Backport to 0.1.2: 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).



Property changes on: tor/branches/tor-0_1_2-patches
___________________________________________________________________
 svk:merge ticket from /tor/012 [r16691] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/branches/tor-0_1_2-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_1_2-patches/ChangeLog	2008-07-03 15:04:25 UTC (rev 15627)
+++ tor/branches/tor-0_1_2-patches/ChangeLog	2008-07-03 15:04:51 UTC (rev 15628)
@@ -30,6 +30,9 @@
     - Fix a dumb bug that was preventing us from knowing that we should
       preemptively build circuits to handle expected directory requests.
       Fixes bug 660.
+    - 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.
 
   o Minor testing features:
     - Add disabled-by-default code to log the relative probability of routing

Modified: tor/branches/tor-0_1_2-patches/src/common/util.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/common/util.c	2008-07-03 15:04:25 UTC (rev 15627)
+++ tor/branches/tor-0_1_2-patches/src/common/util.c	2008-07-03 15:04:51 UTC (rev 15628)
@@ -2070,8 +2070,7 @@
     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);