| Message ID | 160346407256.79082.7549570817445542217.stgit@klimt.1015granger.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | NFSD: MKNOD should return NFSERR_BADTYPE instead of NFSERR_INVAL | expand |
And, applied. I should see about sending a pull request Monday....--b. On Fri, Oct 23, 2020 at 10:41:12AM -0400, Chuck Lever wrote: > A late paragraph of RFC 1813 Section 3.3.11 states: > > | ... if the server does not support the target type or the > | target type is illegal, the error, NFS3ERR_BADTYPE, should > | be returned. Note that NF3REG, NF3DIR, and NF3LNK are > | illegal types for MKNOD. > > The Linux NFS server incorrectly returns NFSERR_INVAL in these > cases. > > Signed-off-by: Chuck Lever <chuck.lever@oracle.com> > --- > fs/nfsd/nfs3proc.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c > index 14468613d150..a633044b0dc1 100644 > --- a/fs/nfsd/nfs3proc.c > +++ b/fs/nfsd/nfs3proc.c > @@ -316,10 +316,6 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) > fh_copy(&resp->dirfh, &argp->fh); > fh_init(&resp->fh, NFS3_FHSIZE); > > - if (argp->ftype == 0 || argp->ftype >= NF3BAD) { > - resp->status = nfserr_inval; > - goto out; > - } > if (argp->ftype == NF3CHR || argp->ftype == NF3BLK) { > rdev = MKDEV(argp->major, argp->minor); > if (MAJOR(rdev) != argp->major || > @@ -328,7 +324,7 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) > goto out; > } > } else if (argp->ftype != NF3SOCK && argp->ftype != NF3FIFO) { > - resp->status = nfserr_inval; > + resp->status = nfserr_badtype; > goto out; > } > >
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 14468613d150..a633044b0dc1 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c @@ -316,10 +316,6 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) fh_copy(&resp->dirfh, &argp->fh); fh_init(&resp->fh, NFS3_FHSIZE); - if (argp->ftype == 0 || argp->ftype >= NF3BAD) { - resp->status = nfserr_inval; - goto out; - } if (argp->ftype == NF3CHR || argp->ftype == NF3BLK) { rdev = MKDEV(argp->major, argp->minor); if (MAJOR(rdev) != argp->major || @@ -328,7 +324,7 @@ nfsd3_proc_mknod(struct svc_rqst *rqstp) goto out; } } else if (argp->ftype != NF3SOCK && argp->ftype != NF3FIFO) { - resp->status = nfserr_inval; + resp->status = nfserr_badtype; goto out; }
A late paragraph of RFC 1813 Section 3.3.11 states: | ... if the server does not support the target type or the | target type is illegal, the error, NFS3ERR_BADTYPE, should | be returned. Note that NF3REG, NF3DIR, and NF3LNK are | illegal types for MKNOD. The Linux NFS server incorrectly returns NFSERR_INVAL in these cases. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- fs/nfsd/nfs3proc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)