diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2016-07-18 13:46:42 -0400 |
|---|---|---|
| committer | Jorge Lucangeli Obes <jorgelo@google.com> | 2016-07-18 13:46:42 -0400 |
| commit | bae15b4f46e2848b43b32a85f346ad2a3163240c (patch) | |
| tree | 262f3072d10a6209db69054bca2aa8d1b3215fe1 /sdcard | |
| parent | 97f49e5cb3a04dc15c9fa04074102f9d29b21936 (diff) | |
| download | system_core-bae15b4f46e2848b43b32a85f346ad2a3163240c.tar.gz system_core-bae15b4f46e2848b43b32a85f346ad2a3163240c.tar.bz2 system_core-bae15b4f46e2848b43b32a85f346ad2a3163240c.zip | |
Use arraysize() for supplementary groups.
Also make adbd use ScopedMinijail.
Bug: 30191189
Change-Id: I5e259aa466817b51037912aba043ba75bd35f9e1
Diffstat (limited to 'sdcard')
| -rw-r--r-- | sdcard/sdcard.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sdcard/sdcard.cpp b/sdcard/sdcard.cpp index e82f29ed4..ba636366f 100644 --- a/sdcard/sdcard.cpp +++ b/sdcard/sdcard.cpp @@ -29,6 +29,7 @@ #include <unistd.h> #include <android-base/logging.h> +#include <android-base/macros.h> #include <cutils/fs.h> #include <cutils/hashmap.h> @@ -209,7 +210,7 @@ static int fuse_setup(struct fuse* fuse, gid_t gid, mode_t mask) { static void drop_privs(uid_t uid, gid_t gid) { ScopedMinijail j(minijail_new()); - minijail_set_supplementary_gids(j.get(), sizeof(kGroups) / sizeof(kGroups[0]), kGroups); + minijail_set_supplementary_gids(j.get(), arraysize(kGroups), kGroups); minijail_change_gid(j.get(), gid); minijail_change_uid(j.get(), uid); /* minijail_enter() will abort if priv-dropping fails. */ |