d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs_exports: Tighten bounds and assert consistency of numsecflavors

Browse Source 
We know the value must be greater than 0 and less than MAXSECFLAVORS.

Reject values outside this range in the initial check in vfs_export and add KASSERTs
in the later consumers.

Also check that we are called with one of either MNT_DELEXPORT or MNT_EXPORTED set.

Reviewed by:	rmacklem
Approved by:	mav (mentor)
MFC after:	1 week
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D24753
This commit is contained in:
Ryan Moeller 2020-05-11 15:38:44 +00:00
parent 9287f06d08
commit e51e957e17
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/vfs_export.c
View File

@ -112,6 +112,11 @@ vfs_hang_addrlist(struct mount *mp, struct netexport *nep,
#endif
int error;
KASSERT(argp->ex_numsecflavors > 0,
("%s: numsecflavors <= 0", __func__));
KASSERT(argp->ex_numsecflavors < MAXSECFLAVORS,
("%s: numsecflavors >= MAXSECFLAVORS", __func__));
/*
* XXX: This routine converts from a `struct xucred'
* (argp->ex_anon) to a `struct ucred' (np->netc_anon). This
@ -300,8 +305,12 @@ vfs_export(struct mount *mp, struct export_args *argp)
struct netexport *nep;
int error;
if (argp->ex_numsecflavors < 0
|| argp->ex_numsecflavors >= MAXSECFLAVORS)
if ((argp->ex_flags & (MNT_DELEXPORT | MNT_EXPORTED)) == 0)
return (EINVAL);
if ((argp->ex_flags & MNT_EXPORTED) != 0 &&
(argp->ex_numsecflavors <= 0
|| argp->ex_numsecflavors >= MAXSECFLAVORS))
return (EINVAL);
error = 0;
@ -518,8 +527,13 @@ vfs_stdcheckexp(struct mount *mp, struct sockaddr *nam, int *extflagsp,
*extflagsp = np->netc_exflags;
if ((*credanonp = np->netc_anon) != NULL)
crhold(*credanonp);
if (numsecflavors)
if (numsecflavors) {
*numsecflavors = np->netc_numsecflavors;
KASSERT(*numsecflavors > 0,
("%s: numsecflavors <= 0", __func__));
KASSERT(*numsecflavors < MAXSECFLAVORS,
("%s: numsecflavors >= MAXSECFLAVORS", __func__));
}
if (secflavors)
*secflavors = np->netc_secflavors;
lockmgr(&mp->mnt_explock, LK_RELEASE, NULL);