diff options
| author | Jorge Lucangeli Obes <jorgelo@google.com> | 2016-07-18 20:06:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-18 20:06:19 +0000 |
| commit | 3ab30ecf4ce502b4fe9430a92d125358e2bdc871 (patch) | |
| tree | f4c50a39f7d0370920a8474e37b6675911a61c3b /sdcard | |
| parent | fe4f764e7542715d0ca42d3af4c465a4ed1d3e66 (diff) | |
| parent | ddbcecec3a28b0916c1f7f098c3e6995d46687de (diff) | |
| download | system_core-3ab30ecf4ce502b4fe9430a92d125358e2bdc871.tar.gz system_core-3ab30ecf4ce502b4fe9430a92d125358e2bdc871.tar.bz2 system_core-3ab30ecf4ce502b4fe9430a92d125358e2bdc871.zip | |
Merge \"Use arraysize() for supplementary groups.\"
am: ddbcecec3a
Change-Id: Ia8405d8bc181b1cdbf1f0812c0dbe8f7701747ef
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. */ |