ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes Ieb94caab,I762da21e

Browse source 
* changes:
  init: move initial property area allocation into bionic
  property_service: make /dev/__properties__ readable
This commit is contained in:
Colin Cross 2013-06-25 00:07:54 +00:00 • committed by Gerrit Code Review
commit b6c6028594
1 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
init/property_service.c
View file

@ -110,7 +110,6 @@ struct {
}; };
typedef struct { typedef struct {
void *data;
size_t size; size_t size;
int fd; int fd;
} workspace; } workspace;
@ -118,38 +117,13 @@ typedef struct {
static int init_workspace(workspace *w, size_t size) static int init_workspace(workspace *w, size_t size)
{ {
void *data; void *data;
int fd; int fd = open(PROP_FILENAME, O_RDONLY | O_NOFOLLOW);
/* 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) if (fd < 0)
return -1; return -1;
if (ftruncate(fd, size) < 0)
goto out;
data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if(data == MAP_FAILED)
goto out;
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->size = size;
w->fd = fd; w->fd = fd;
return 0; return 0;
out:
close(fd);
return -1;
} }
static workspace pa_workspace; static workspace pa_workspace;
@ -159,13 +133,14 @@ static int init_property_area(void)
if (property_area_inited) if (property_area_inited)
return -1; return -1;
if(init_workspace(&pa_workspace, PA_SIZE)) if(__system_property_area_init())
return -1;
if(init_workspace(&pa_workspace, 0))
return -1; return -1;
fcntl(pa_workspace.fd, F_SETFD, FD_CLOEXEC); fcntl(pa_workspace.fd, F_SETFD, FD_CLOEXEC);
__system_property_area_init(pa_workspace.data);
property_area_inited = 1; property_area_inited = 1;
return 0; return 0;
} }