Fix a merge conflict.
r224086 added "goto out"-style error handling to nfssvc_nfsd(), in order to reliably call NFSEXITCODE() before returning. Our Capsicum changes, based on the old "return (error)" model, did not merge nicely. Approved by: re (kib), mentor (rwatson) Sponsored by: Google Inc
This commit is contained in:
parent
d6f7248983
commit
985a88e2a6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=224911
@ -3036,7 +3036,6 @@ nfssvc_nfsd(struct thread *td, struct nfssvc_args *uap)
|
||||
*/
|
||||
if ((error = fget(td, sockarg.sock, CAP_SOCK_ALL, &fp)) != 0)
|
||||
goto out;
|
||||
return (error);
|
||||
if (fp->f_type != DTYPE_SOCKET) {
|
||||
fdrop(fp, td);
|
||||
error = EPERM;
|
||||
|
Loading…
Reference in New Issue
Block a user