git: faa9bcee1540 - stable/14 - initgroups(3): Fix return value on allocation failure
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 Oct 2025 17:16:22 UTC
The branch stable/14 has been updated by olce:
URL: https://cgit.FreeBSD.org/src/commit/?id=faa9bcee15407bf8fc0985fbc759897290d79ca5
commit faa9bcee15407bf8fc0985fbc759897290d79ca5
Author: Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-09-16 15:52:20 +0000
Commit: Olivier Certner <olce@FreeBSD.org>
CommitDate: 2025-10-10 17:15:57 +0000
initgroups(3): Fix return value on allocation failure
We must not return ENOMEM, but rather -1 with 'errno' set to ENOMEM, as
described in the manual page and as other implementations are doing.
A malloc() failure actually already sets ENOMEM for us. Add comments
indicating which function set 'errno' each time we return.
While here, improve style and remove useless headers.
Reviewed by: kib, emaste
Fixes: 54404cfb13d4 ("In preparation for raising NGROUPS and NGROUPS_MAX, ...")
MFC after: 5 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D52580
(cherry picked from commit 0b018cfd81d8fdd64af3fe94c6989a82c0d3afa9)
---
lib/libc/gen/initgroups.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
index 6e417d6a62ed..9dd162978a52 100644
--- a/lib/libc/gen/initgroups.c
+++ b/lib/libc/gen/initgroups.c
@@ -33,11 +33,7 @@
__SCCSID("@(#)initgroups.c 8.1 (Berkeley) 6/4/93");
#include <sys/param.h>
-#include "namespace.h"
-#include <err.h>
-#include "un-namespace.h"
#include <errno.h>
-#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -53,12 +49,13 @@ initgroups(const char *uname, gid_t agroup)
* setgroups to fail and set errno.
*/
ngroups_max = sysconf(_SC_NGROUPS_MAX) + 2;
- if ((groups = malloc(sizeof(*groups) * ngroups_max)) == NULL)
- return (ENOMEM);
+ groups = malloc(sizeof(*groups) * ngroups_max);
+ if (groups == NULL)
+ return (-1); /* malloc() set 'errno'. */
ngroups = (int)ngroups_max;
getgrouplist(uname, agroup, groups, &ngroups);
ret = setgroups(ngroups, groups);
free(groups);
- return (ret);
+ return (ret); /* setgroups() set 'errno'. */
}