mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-13 10:02:38 +00:00
Code Issues Releases Activity

nfscl: Add NFSD_CURVNET macros to nfsclient syscall

Browse Source 
Although the nfsclient syscall is used for client side,
it does set up server side krpc for callbacks.  As such,
it needs to have the vnet set.  This patch does this.
Without this patch, the system would crash when the
nfscbd(8) daemon was killed.

Reported by:	freebsd@walstatt-de.de
MFC after:	3 months
This commit is contained in:
Rick Macklem 2023-02-20 16:40:07 -08:00
parent 8e022d3cde
commit 357492c995
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/fs/nfsclient/nfs_clport.c
View File

@ -1276,10 +1276,11 @@ nfssvc_nfscl(struct thread *td, struct nfssvc_args *uap)
struct mount *mp;
struct nfsmount *nmp;
NFSD_CURVNET_SET(NFSD_TD_TO_VNET(td));
if (uap->flag & NFSSVC_CBADDSOCK) {
error = copyin(uap->argp, (caddr_t)&nfscbdarg, sizeof(nfscbdarg));
if (error)
return (error);
goto out;
/*
* Since we don't know what rights might be required,
* pretend that we need them all. It is better to be too
@ -1288,10 +1289,11 @@ nfssvc_nfscl(struct thread *td, struct nfssvc_args *uap)
error = fget(td, nfscbdarg.sock,
cap_rights_init_one(&rights, CAP_SOCK_CLIENT), &fp);
if (error)
return (error);
goto out;
if (fp->f_type != DTYPE_SOCKET) {
fdrop(fp, td);
return (EPERM);
error = EPERM;
goto out;
}
error = nfscbd_addsock(fp);
fdrop(fp, td);
@ -1300,12 +1302,14 @@ nfssvc_nfscl(struct thread *td, struct nfssvc_args *uap)
nfscl_enablecallb = 1;
}
} else if (uap->flag & NFSSVC_NFSCBD) {
if (uap->argp == NULL)
return (EINVAL);
if (uap->argp == NULL) {
error = EINVAL;
goto out;
}
error = copyin(uap->argp, (caddr_t)&nfscbdarg2,
sizeof(nfscbdarg2));
if (error)
return (error);
goto out;
error = nfscbd_nfsd(td, &nfscbdarg2);
} else if (uap->flag & NFSSVC_DUMPMNTOPTS) {
error = copyin(uap->argp, &dumpmntopts, sizeof(dumpmntopts));
@ -1391,6 +1395,8 @@ nfssvc_nfscl(struct thread *td, struct nfssvc_args *uap)
} else {
error = EINVAL;
}
out:
NFSD_CURVNET_RESTORE();
return (error);
}