commit 25e3f4a90d7f314438ec9895618abf6116425a9f
author Nick Kralevich <nnk@google.com> Tue Jan 22 21:26:18 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 22 21:26:18 2013 +0000
tree 1b2664b5c9b107b17da8aa42fcd1f32cf700d5a4
parent f669fdf11ec4a17bf0bedcc90d5b3613660567de
parent 8897a9565a220099a6df730ed14c1a346508f9d1

Merge "Revert "libc: make system properties more secure.""

libc/bionic/system_properties.c

diff --git a/libc/bionic/system_properties.c b/libc/bionic/system_properties.c
index 8e53acc..caa5ca6 100644
--- a/libc/bionic/system_properties.c
+++ b/libc/bionic/system_properties.c
@@ -31,7 +31,6 @@
 #include <stddef.h>
 #include <errno.h>
 #include <poll.h>
-#include <fcntl.h>
 
 #include <sys/mman.h>
 
@@ -39,7 +38,6 @@
 #include <sys/un.h>
 #include <sys/select.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <netinet/in.h>
 #include <unistd.h>
 
@@ -57,34 +55,33 @@
 int __system_properties_init(void)
 {
     prop_area *pa;
-    int fd;
-    struct stat fd_stat;
+    int s, fd;
+    unsigned sz;
+    char *env;
 
     if(__system_property_area__ != ((void*) &dummy_props)) {
         return 0;
     }
 
-    fd = open(PROP_FILENAME, O_RDONLY | O_NOFOLLOW);
-
-    if (fd < 0) {
+    env = getenv("ANDROID_PROPERTY_WORKSPACE");
+    if (!env) {
         return -1;
     }
-
-    if (fstat(fd, &fd_stat) < 0) {
-        close(fd);
+    fd = atoi(env);
+    env = strchr(env, ',');
+    if (!env) {
         return -1;
     }
-
-    pa = mmap(0, fd_stat.st_size, PROT_READ, MAP_SHARED, fd, 0);
-
-    close(fd);
+    sz = atoi(env + 1);
+    
+    pa = mmap(0, sz, PROT_READ, MAP_SHARED, fd, 0);
     
     if(pa == MAP_FAILED) {
         return -1;
     }
 
     if((pa->magic != PROP_AREA_MAGIC) || (pa->version != PROP_AREA_VERSION)) {
-        munmap(pa, fd_stat.st_size);
+        munmap(pa, sz);
         return -1;
     }
 
@@ -221,6 +218,8 @@
 int __system_property_set(const char *key, const char *value)
 {
     int err;
+    int tries = 0;
+    int update_seen = 0;
     prop_msg msg;
 
     if(key == 0) return -1;

libc/include/sys/_system_properties.h

diff --git a/libc/include/sys/_system_properties.h b/libc/include/sys/_system_properties.h
index 10c0fae..42a7f6c 100644
--- a/libc/include/sys/_system_properties.h
+++ b/libc/include/sys/_system_properties.h
@@ -41,7 +41,6 @@
 #define PROP_AREA_VERSION 0x45434f76
 
 #define PROP_SERVICE_NAME "property_service"
-#define PROP_FILENAME "/dev/__properties__"
 
 /* #define PROP_MAX_ENTRIES 247 */
 /* 247 -> 32620 bytes (<32768) */