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

do not merge: cherry-picked 44db990d3a from master branch 

Change-Id: I03e99bfa70ab86eb8eaa2984b6da26a92bd2718a
This commit is contained in:
Nick Kralevich 2010-08-27 14:35:07 -07:00
parent 5f5d5c8cef
commit 2ad6067ce4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
adb/adb.c
View File

@ -885,7 +885,9 @@ int adb_main(int is_daemon)
struct __user_cap_header_struct header;
struct __user_cap_data_struct cap;
prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);
if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) != 0) {
exit(1);
}
/* add extra groups:
** AID_ADB to access the USB driver
@ -899,11 +901,17 @@ int adb_main(int is_daemon)
*/
gid_t groups[] = { AID_ADB, AID_LOG, AID_INPUT, AID_INET, AID_GRAPHICS,
AID_NET_BT, AID_NET_BT_ADMIN, AID_SDCARD_RW, AID_MOUNT };
setgroups(sizeof(groups)/sizeof(groups[0]), groups);
if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
exit(1);
}
/* then switch user and group to "shell" */
setgid(AID_SHELL);
setuid(AID_SHELL);
if (setgid(AID_SHELL) != 0) {
exit(1);
}
if (setuid(AID_SHELL) != 0) {
exit(1);
}
/* set CAP_SYS_BOOT capability, so "adb reboot" will succeed */
header.version = _LINUX_CAPABILITY_VERSION;