generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update bionic to know users and isolated uids for uid string representation.

Browse Source 
Change-Id: I6681bacd69299a7f9837ef8025a80c5562081bad
This commit is contained in:
Dianne Hackborn 2012-02-09 16:14:28 -08:00
parent 1625c7a837
commit 058d6d88b9
1 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libc/bionic/stubs.c
View File

@ -250,30 +250,58 @@ android_name_to_group( struct group *gr, const char *name )
static unsigned static unsigned
app_id_from_name( const char* name ) app_id_from_name( const char* name )
{ {
unsigned long id; unsigned long userid;
unsigned long appid;
char* end; char* end;
if (memcmp(name, "app_", 4) != 0 || !isdigit(name[4])) if (name[0] != 'u' || !isdigit(name[1]))
goto FAIL; goto FAIL;
id = strtoul(name+4, &end, 10); userid = strtoul(name+1, &end, 10);
if (*end != '\0') if (end[0] != '_' || end[1] == 0 || !isdigit(end[2]))
goto FAIL; goto FAIL;
id += AID_APP; if (end[1] == 'a')
appid = strtoul(end+2, &end, 10) + AID_APP;
/* check for overflow and that the value can be else if (end[1] == 'i')
* stored in our 32-bit uid_t/gid_t */ appid = strtoul(end+2, &end, 10) + AID_ISOLATED_START;
if (id < AID_APP || (unsigned)id != id) else
goto FAIL; goto FAIL;
return (unsigned)id; if (end[0] != 0)
goto FAIL;
/* check that user id won't overflow */
if (userid > 1000)
goto FAIL;
/* check that app id is within range */
if (appid < AID_APP || appid >= AID_USER)
goto FAIL;
return (unsigned)(appid + userid*AID_USER);
FAIL: FAIL:
errno = ENOENT; errno = ENOENT;
return 0; return 0;
} }
static void
print_app_uid_name(uid_t uid, char* buffer, int bufferlen)
{
uid_t appid;
uid_t userid;
appid = uid % AID_USER;
userid = uid / AID_USER;
if (appid < AID_ISOLATED_START) {
snprintf(buffer, bufferlen, "u%u_a%u", userid, appid - AID_APP);
} else {
snprintf(buffer, bufferlen, "u%u_i%u", userid, appid - AID_ISOLATED_START);
}
}
/* translate a uid into the corresponding app_<uid> /* translate a uid into the corresponding app_<uid>
* passwd structure (sets errno to ENOENT on failure) * passwd structure (sets errno to ENOENT on failure)
*/ */
@ -287,8 +315,7 @@ app_id_to_passwd(uid_t uid, stubs_state_t* state)
return NULL; return NULL;
} }
snprintf( state->app_name_buffer, sizeof state->app_name_buffer, print_app_uid_name(uid, state->app_name_buffer, sizeof state->app_name_buffer);
"app_%u", uid - AID_APP );
pw->pw_name = state->app_name_buffer; pw->pw_name = state->app_name_buffer;
pw->pw_dir = "/data"; pw->pw_dir = "/data";
@ -306,14 +333,15 @@ static struct group*
app_id_to_group(gid_t gid, stubs_state_t* state) app_id_to_group(gid_t gid, stubs_state_t* state)
{ {
struct group* gr = &state->group; struct group* gr = &state->group;
int appid;
int userid;
if (gid < AID_APP) { if (gid < AID_APP) {
errno = ENOENT; errno = ENOENT;
return NULL; return NULL;
} }
snprintf(state->group_name_buffer, sizeof state->group_name_buffer, print_app_uid_name(gid, state->group_name_buffer, sizeof state->group_name_buffer);
"app_%u", gid - AID_APP);
gr->gr_name = state->group_name_buffer; gr->gr_name = state->group_name_buffer;
gr->gr_gid = gid; gr->gr_gid = gid;