ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am f11b58f2: am fcf1689c: am 5fec7915: Merge "service_manager: reorder permission checks for find"

Browse Source 
* commit 'f11b58f296039a0bf90336e4c38c014f11542092':
  service_manager: reorder permission checks for find
This commit is contained in:
Nick Kralevich 2015-03-05 22:43:39 +00:00 committed by Android Git Automerger
commit 8f1ef92edc
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cmds/servicemanager/service_manager.c
View File

@ -169,16 +169,12 @@ uint16_t svcmgr_id[] = {
uint32_t do_find_service(struct binder_state *bs, const uint16_t *s, size_t len, uid_t uid, pid_t spid) uint32_t do_find_service(struct binder_state *bs, const uint16_t *s, size_t len, uid_t uid, pid_t spid)
{ {
struct svcinfo *si; struct svcinfo *si = find_svc(s, len);
if (!svc_can_find(s, len, spid)) { if (!si || !si->handle) {
ALOGE("find_service('%s') uid=%d - PERMISSION DENIED\n",
str8(s, len), uid);
return 0; return 0;
} }
si = find_svc(s, len);
//ALOGI("check_service('%s') handle = %x\n", str8(s, len), si ? si->handle : 0);
if (si && si->handle) {
if (!si->allow_isolated) { if (!si->allow_isolated) {
// If this service doesn't allow access from isolated processes, // If this service doesn't allow access from isolated processes,
// then check the uid to see if it is isolated. // then check the uid to see if it is isolated.
@ -187,10 +183,12 @@ uint32_t do_find_service(struct binder_state *bs, const uint16_t *s, size_t len,
return 0; return 0;
} }
} }
return si->handle;
} else { if (!svc_can_find(s, len, spid)) {
return 0; return 0;
} }
return si->handle;
} }
int do_add_service(struct binder_state *bs, int do_add_service(struct binder_state *bs,