commit b938756eb3a2911b7230abf0b35356146afd19dc
author Greg Hackmann <ghackmann@google.com> Mon Jun 24 18:05:14 2013 -0700
committer Greg Hackmann <ghackmann@google.com> Mon Jun 24 18:05:14 2013 -0700
tree d8b58028c831c0b05539b4bd121d40eafcd36e80
parent 982463d99b56a53d6b560a12fe19ed4c7675b425

Revert "bionic: prevent root processes from calling __system_property_add"

This reverts commit fb9b7b436f3ef94385f1b0c55ab81f246f0d96b8.

libc/bionic/system_properties.c

diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c
index f9671c6..d4054d2 100644
--- a/libc/bionic/system_properties.c
+++ b/libc/bionic/system_properties.c
@@ -128,13 +128,11 @@
 {
     prop_area *pa;
     int fd;
-    int ret;
 
     /* dev is a tmpfs that we can use to carve a shared workspace
      * out of, so let's do that...
      */
-    fd = open(property_filename, O_RDWR | O_CREAT | O_NOFOLLOW | O_CLOEXEC |
-            O_EXCL, 0444);
+    fd = open(property_filename, O_RDWR | O_CREAT | O_NOFOLLOW, 0644);
     if (fd < 0) {
         if (errno == EACCES) {
             /* for consistency with the case where the process has already
@@ -145,10 +143,6 @@
         return -1;
     }
 
-    ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
-    if (ret < 0)
-        goto out;
-
     if (ftruncate(fd, PA_SIZE) < 0)
         goto out;
 
@@ -192,16 +186,8 @@
 {
     bool fromFile = true;
     int result = -1;
-    int fd;
-    int ret;
 
-    fd = open(property_filename, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
-    if (fd >= 0) {
-        /* For old kernels that don't support O_CLOEXEC */
-        ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
-        if (ret < 0)
-            goto cleanup;
-    }
+    int fd = open(property_filename, O_RDONLY | O_NOFOLLOW);
 
     if ((fd < 0) && (errno == ENOENT)) {
         /*