setpriv: Improve getgroups() Portability

setpriv(1) is Linux-only, and on Linux, getgroups() returns at least one group.
However, it's better to use more portable and generic code patterns and assume
that getgroups() can return zero.

Fixes: https://github.com/util-linux/util-linux/issues/3654
Reported-by: Alejandro Colomar <alx@kernel.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 434a5633a563066357bbc3f331838ed41041ec1a)

diff --git a/sys-utils/setpriv.c b/sys-utils/setpriv.c
index daa3ab366b17658bdd8ade84cf3da592771199f9..7242c333dbe6fa951137cf85adc299927bdc6d11 100644 (file)
--- a/sys-utils/setpriv.c
+++ b/sys-utils/setpriv.c
@@ -294,19 +294,15 @@ static void dump_label(const char *name)
 static void dump_groups(void)
 {
        int n = getgroups(0, NULL);
-       gid_t *groups;
-
-       if (n < 0) {
-               warn("getgroups failed");
-               return;
-       }
-
-       groups = xmalloc(n * sizeof(gid_t));
-       n = getgroups(n, groups);
-       if (n < 0) {
-               free(groups);
-               warn("getgroups failed");
-               return;
+       gid_t *groups = NULL;
+
+       if (n < 0)
+               goto failed;
+       if (n) {
+               groups = xmalloc(n * sizeof(gid_t));
+               n = getgroups(n, groups);
+               if (n < 0)
+                       goto failed;
        }
 
        printf(_("Supplementary groups: "));
@@ -322,6 +318,10 @@ static void dump_groups(void)
        }
        printf("\n");
        free(groups);
+       return;
+failed:
+       free(groups);
+       warn("getgroups failed");
 }
 
 static void dump_pdeathsig(void)