Revert "init: make system properties more secure."
This reverts commit 51e06618dbd87c4374c56d9193a5e567aa3d02ac.
Bug: 8045561
diff --git a/init/property_service.c b/init/property_service.c
index b608d2f..61dd86f 100755
--- a/init/property_service.c
+++ b/init/property_service.c
@@ -112,6 +112,7 @@
typedef struct {
void *data;
size_t size;
+ int fd;
} workspace;
static int init_workspace(workspace *w, size_t size)
@@ -119,10 +120,10 @@
void *data;
int fd;
- /* dev is a tmpfs that we can use to carve a shared workspace
- * out of, so let's do that...
- */
- fd = open(PROP_FILENAME, O_RDWR | O_CREAT | O_NOFOLLOW, 0644);
+ /* dev is a tmpfs that we can use to carve a shared workspace
+ * out of, so let's do that...
+ */
+ fd = open("/dev/__properties__", O_RDWR | O_CREAT | O_NOFOLLOW, 0600);
if (fd < 0)
return -1;
@@ -135,8 +136,15 @@
close(fd);
+ fd = open("/dev/__properties__", O_RDONLY | O_NOFOLLOW);
+ if (fd < 0)
+ return -1;
+
+ unlink("/dev/__properties__");
+
w->data = data;
w->size = size;
+ w->fd = fd;
return 0;
out:
@@ -166,6 +174,8 @@
if(init_workspace(&pa_workspace, PA_SIZE))
return -1;
+ fcntl(pa_workspace.fd, F_SETFD, FD_CLOEXEC);
+
pa_info_array = (void*) (((char*) pa_workspace.data) + PA_INFO_START);
pa = pa_workspace.data;
@@ -453,6 +463,12 @@
}
}
+void get_property_workspace(int *fd, int *sz)
+{
+ *fd = pa_workspace.fd;
+ *sz = pa_workspace.size;
+}
+
static void load_properties(char *data)
{
char *key, *value, *eol, *sol, *tmp;