From bae15b4f46e2848b43b32a85f346ad2a3163240c Mon Sep 17 00:00:00 2001
From: Jorge Lucangeli Obes <jorgelo@google.com>
Date: Mon, 18 Jul 2016 13:46:42 -0400
Subject: Use arraysize() for supplementary groups.

Also make adbd use ScopedMinijail.

Bug: 30191189
Change-Id: I5e259aa466817b51037912aba043ba75bd35f9e1
---
 sdcard/sdcard.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sdcard')

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. */
-- 
cgit v1.2.3