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 71ead183: Close the client socket early for ctl.* properties. 

* commit '71ead1835317af5305f9ef87ce06ebdf9cff92e6':
  Close the client socket early for ctl.* properties.
This commit is contained in:
Brad Fitzpatrick 2011-04-01 12:24:10 -07:00 committed by Android Git Automerger
parent 0dd572a519 71ead18353
commit 47e4ee5958
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init/property_service.c
View File

@ -388,6 +388,9 @@ void handle_property_set_fd()
msg.value[PROP_VALUE_MAX-1] = 0;
if(memcmp(msg.name,"ctl.",4) == 0) {
// Keep the old close-socket-early behavior when handling
// ctl.* properties.
close(s);
if (check_control_perms(msg.value, cr.uid, cr.gid)) {
handle_control_message((char*) msg.name + 4, (char*) msg.value);
} else {
@ -401,17 +404,18 @@ void handle_property_set_fd()
ERROR("sys_prop: permission denied uid:%d name:%s\n",
cr.uid, msg.name);
}
// 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);
}
break;
default:
close(s);
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)