Module Name: src
Committed By: hannken
Date: Mon Oct 12 08:21:21 UTC 2020
Modified Files:
src/external/cddl/osnet/sys/sys: cred.h
Log Message:
Stub groupmember() has to test both group list and current group id.
Fixes kern/55675: ZFS mounts do not work with setuid programs
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/sys/sys/cred.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/cred.h
diff -u src/external/cddl/osnet/sys/sys/cred.h:1.7 src/external/cddl/osnet/sys/sys/cred.h:1.8
--- src/external/cddl/osnet/sys/sys/cred.h:1.7 Wed Apr 29 05:54:37 2020
+++ src/external/cddl/osnet/sys/sys/cred.h Mon Oct 12 08:21:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cred.h,v 1.7 2020/04/29 05:54:37 riastradh Exp $ */
+/* $NetBSD: cred.h,v 1.8 2020/10/12 08:21:21 hannken Exp $ */
/*-
* Copyright (c) 2007 Pawel Jakub Dawidek <p...@freebsd.org>
@@ -70,10 +70,12 @@ extern kauth_cred_t cred0;
static __inline int
groupmember(gid_t gid, cred_t *cr)
{
- int result;
+ int result, error;
- kauth_cred_ismember_gid(cr, gid, &result);
- return result;
+ error = kauth_cred_ismember_gid(cr, gid, &result);
+ if (error)
+ return 0;
+ return (kauth_cred_getegid(cr) == gid || result);
}
#endif /* _KERNEL */
