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

Merge "Remove special case handling of "ro." properties permissions"

Browse source 
am: b45f8179be

* commit 'b45f8179be0fc14f86d5076bdc75a58cca5ef46b':
  Remove special case handling of "ro." properties permissions
This commit is contained in:
Tom Cherry 2016-01-12 20:54:46 +00:00 • committed by android-build-merger
commit 44e06f5f00
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init/property_service.cpp
View file

@ -113,18 +113,6 @@ static int check_control_mac_perms(const char *name, char *sctx, struct ucred *c
return check_mac_perms(ctl_name, sctx, cr); return check_mac_perms(ctl_name, sctx, cr);
} }
/*
* Checks permissions for setting system properties.
* Returns 1 if uid allowed, 0 otherwise.
*/
static int check_perms(const char *name, char *sctx, struct ucred *cr)
{
if(!strncmp(name, "ro.", 3))
name +=3;
return check_mac_perms(name, sctx, cr);
}
std::string property_get(const char* name) { std::string property_get(const char* name) {
char value[PROP_VALUE_MAX] = {0}; char value[PROP_VALUE_MAX] = {0};
__system_property_get(name, value); __system_property_get(name, value);
@ -312,7 +300,7 @@ static void handle_property_set_fd()
msg.name + 4, msg.value, cr.uid, cr.gid, cr.pid); msg.name + 4, msg.value, cr.uid, cr.gid, cr.pid);
} }
} else { } else {
if (check_perms(msg.name, source_ctx, &cr)) { if (check_mac_perms(msg.name, source_ctx, &cr)) {
property_set((char*) msg.name, (char*) msg.value); property_set((char*) msg.name, (char*) msg.value);
} else { } else {
ERROR("sys_prop: permission denied uid:%d name:%s\n", ERROR("sys_prop: permission denied uid:%d name:%s\n",