Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177658563
D47204.1794965991.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D47204.1794965991.diff
View Options
diff --git a/sys/fs/nfsserver/nfs_nfsdsubs.c.0groups b/sys/fs/nfsserver/nfs_nfsdsubs.c
--- a/sys/fs/nfsserver/nfs_nfsdsubs.c.0groups
+++ b/sys/fs/nfsserver/nfs_nfsdsubs.c
@@ -1620,7 +1620,7 @@
if (nd->nd_cred->cr_uid == 0)
goto out;
if ((NFSVNO_ISSETUID(nvap) && nvap->na_uid != nd->nd_cred->cr_uid) ||
- (NFSVNO_ISSETGID(nvap) && nvap->na_gid != nd->nd_cred->cr_gid &&
+ (NFSVNO_ISSETGID(nvap) &&
!groupmember(nvap->na_gid, nd->nd_cred)))
error = NFSERR_PERM;
@@ -1679,8 +1679,7 @@
}
if (NFSISSET_ATTRBIT(attrbitp, NFSATTRBIT_OWNERGROUP) &&
NFSVNO_ISSETGID(nvap)) {
- if (nvap->na_gid == nd->nd_cred->cr_gid ||
- groupmember(nvap->na_gid, nd->nd_cred)) {
+ if (groupmember(nvap->na_gid, nd->nd_cred)) {
nd->nd_cred->cr_uid = 0;
nva.na_gid = nvap->na_gid;
change++;
diff --git a/sys/kern/kern_prot.c.0groups b/sys/kern/kern_prot.c
--- a/sys/kern/kern_prot.c.0groups
+++ b/sys/kern/kern_prot.c
@@ -1310,6 +1310,13 @@
groupmember(gid_t gid, struct ucred *cred)
{
+ /*
+ * The nfsd server can use a credential with zero groups in it
+ * when certain mapped export credentials are specified via exports(5).
+ */
+ if (cred->cr_ngroups == 0)
+ return (false);
+
if (gid == cred->cr_groups[0])
return (true);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Nov 18, 1:39 AM (17 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41812533
Default Alt Text
D47204.1794965991.diff (1 KB)
Attached To
Mode
D47204: Fix the NFS server's handling of exported mapped credentials with cr_ngroups == 0
Attached
Detach File
Event Timeline