summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2010-08-27 15:28:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-27 15:28:24 -0700
commit4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3 (patch)
tree03ece62a81f0a648f84fa73d7bd64b0f91fa6070 /adb
parent64a053b67371595d2b541cd4f945fcec1fb8e9d2 (diff)
parent44db990d3a4ce0edbdd16fa7ac20693ef601b723 (diff)
downloadsystem_core-4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3.zip
system_core-4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3.tar.gz
system_core-4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3.tar.bz2
am 44db990d: Fix bug 2950316. Check return values.
Merge commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723' into gingerbread-plus-aosp * commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723': Fix bug 2950316. Check return values.
Diffstat (limited to 'adb')
-rw-r--r--adb/adb.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/adb/adb.c b/adb/adb.c
index ee78688..0da7218 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -893,7 +893,9 @@ int adb_main(int is_daemon, int server_port)
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
@@ -907,11 +909,17 @@ int adb_main(int is_daemon, int server_port)
*/
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;