[src/trunk]: src/external/cddl/osnet/sys/sys Stub groupmember() has to test b...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/25e6d56eb3e8
branches:  trunk
changeset: 977021:25e6d56eb3e8
user:      hannken <hannken%NetBSD.org@localhost>
date:      Mon Oct 12 08:21:21 2020 +0000

description:
Stub groupmember() has to test both group list and current group id.

Fixes kern/55675: ZFS mounts do not work with setuid programs

diffstat:

 external/cddl/osnet/sys/sys/cred.h |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 90ea2f6d4ed4 -r 25e6d56eb3e8 external/cddl/osnet/sys/sys/cred.h
--- a/external/cddl/osnet/sys/sys/cred.h        Sun Oct 11 22:46:24 2020 +0000
+++ b/external/cddl/osnet/sys/sys/cred.h        Mon Oct 12 08:21:21 2020 +0000
@@ -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 <pjd%FreeBSD.org@localhost>
@@ -70,10 +70,12 @@
 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 */