openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 9f1e0e3a: Close the property socket *after* updating properties. 

* commit '9f1e0e3ae3108086948b74ce58af32df92ff8331':
  Close the property socket *after* updating properties.
This commit is contained in:
Brad Fitzpatrick 2011-03-30 15:46:28 -07:00 committed by Android Git Automerger
parent c3e69903ed 9f1e0e3ae3
commit 9cbac1fc0b
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
init/property_service.c
View File

@ -189,15 +189,6 @@ static void update_prop_info(prop_info *pi, const char *value, unsigned len)
__futex_wake(&pi->serial, INT32_MAX);
}
static int property_write(prop_info *pi, const char *value)
{
int valuelen = strlen(value);
if(valuelen >= PROP_VALUE_MAX) return -1;
update_prop_info(pi, value, valuelen);
return 0;
}
/*
* Checks permissions for starting/stoping system services.
* AID_SYSTEM and AID_ROOT are always allowed.
@ -384,8 +375,8 @@ void handle_property_set_fd()
}
r = recv(s, &msg, sizeof(msg), 0);
close(s);
if(r != sizeof(prop_msg)) {
close(s);
ERROR("sys_prop: mis-match msg size recieved: %d expected: %d\n",
r, sizeof(prop_msg));
return;
@ -416,6 +407,11 @@ void handle_property_set_fd()
default:
break;
}
// Note: bionic's property client code assumes that the property
// server will not close the socket until *AFTER* the property is
// written to memory.
close(s);
}
void get_property_workspace(int *fd, int *sz)