jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 22:23:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cred: crsetgroups(): Throw away old groups before crextend()

Browse Source 
Now that crextend() asserts that groups are not set (rightfully so,
since it may change the backing storage without copying the content of
the old one), have crsetgroups() throw away the old groups before
calling it, as it installs an entirely new set anyway.

This allows to reuse unshared credentials by resetting their groups set,
as NFS exports actually do.

Reported by:    cy
Tested by:      cy
Fixes:          ea26c0e797 ("cred: crextend(): Harden, simplify")
Pointy hat to:  olce

While here, as I forgot these credits in commit 77d652b4b472 ("nfs:
Fallback to GID_NOGROUP on no groups"):
Tested by:    cy, David Wolfskill (panics caused by mountd(8))
Tested by:    kib (MINIMAL/custom kernel compile breakup)
This commit is contained in:
Olivier Certner 2024-11-03 19:04:02 +01:00
parent 2ce493e169
commit 169a10853a
No known key found for this signature in database
GPG Key ID: 8CA13040971E2627
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/kern/kern_prot.c
View File

@ -2217,16 +2217,14 @@ void
crcopy(struct ucred *dest, struct ucred *src)
{
/*
* Ideally, 'cr_ngroups' should be moved out of 'struct ucred''s bcopied
* area, but this would break the ABI, so is deferred until there is
* a compelling need to change it.
*/
bcopy(&src->cr_startcopy, &dest->cr_startcopy,
(unsigned)((caddr_t)&src->cr_endcopy -
(caddr_t)&src->cr_startcopy));
/*
* Avoids an assertion in crsetgroups() -> crextend(). Ideally,
* 'cr_ngroups' should be moved out of 'struct ucred''s bcopied area,
* but this would break the ABI, so is deferred until there is a real
* need to change the ABI.
*/
dest->cr_ngroups = 0;
dest->cr_flags = src->cr_flags;
crsetgroups(dest, src->cr_ngroups, src->cr_groups);
uihold(dest->cr_uidinfo);
@ -2475,6 +2473,13 @@ crsetgroups(struct ucred *cr, int ngrp, const gid_t *groups)
if (ngrp > ngroups_max + 1)
ngrp = ngroups_max + 1;
/*
* crextend() asserts that groups are not set, as it may allocate a new
* backing storage without copying the content of the old one. Since we
* are going to install a completely new set anyway, signal that we
* consider the old ones thrown away.
*/
cr->cr_ngroups = 0;
crextend(cr, ngrp);
crsetgroups_internal(cr, ngrp, groups);
groups_normalize(&cr->cr_ngroups, cr->cr_groups);