Merge changes Id0fe51d0,Ie3b3907b am: e0461422e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1927607
Change-Id: I6315a7ab8655869ac851932a072feeeb954ff607
diff --git a/diagnose_usb/diagnose_usb.cpp b/diagnose_usb/diagnose_usb.cpp
index 35edb5e..5716323 100644
--- a/diagnose_usb/diagnose_usb.cpp
+++ b/diagnose_usb/diagnose_usb.cpp
@@ -19,7 +19,9 @@
#include <errno.h>
#include <unistd.h>
+#include <algorithm>
#include <string>
+#include <vector>
#include <android-base/stringprintf.h>
@@ -45,9 +47,25 @@
return "";
}
- // getgroups(2) indicates that the GNU group_member(3) may not check the egid so we check it
- // additionally just to be sure.
- if (group_member(plugdev_group->gr_gid) || getegid() == plugdev_group->gr_gid) {
+ int ngroups = getgroups(0, nullptr);
+ if (ngroups < 0) {
+ perror("failed to get groups list size");
+ return "";
+ }
+
+ std::vector<gid_t> groups(ngroups);
+ ngroups = getgroups(groups.size(), groups.data());
+ if (ngroups < 0) {
+ perror("failed to get groups list");
+ return "";
+ }
+
+ groups.resize(ngroups);
+
+ // getgroups(2) indicates that the egid may not be included so we check it additionally just
+ // to be sure.
+ if (std::find(groups.begin(), groups.end(), plugdev_group->gr_gid) != groups.end() ||
+ getegid() == plugdev_group->gr_gid) {
// The user is in plugdev so the problem is likely with the udev rules.
return "missing udev rules? user is in the plugdev group";
}
diff --git a/fs_mgr/libdm/include/libdm/dm.h b/fs_mgr/libdm/include/libdm/dm.h
index 332fcf5..1057d7f 100644
--- a/fs_mgr/libdm/include/libdm/dm.h
+++ b/fs_mgr/libdm/include/libdm/dm.h
@@ -24,6 +24,7 @@
#include <linux/types.h>
#include <stdint.h>
#include <sys/sysmacros.h>
+#include <sys/types.h>
#include <unistd.h>
#include <chrono>