Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reply ENAMETOOLONG properly instead of discarding request as BADRPC. 

my own PR20791.
This commit is contained in:
yamt 2003-03-28 13:05:47 +00:00
parent 8a890efe2b
commit 2d45e41adb
3 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
sys/nfs/nfs_serv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_serv.c,v 1.67 2003/02/26 06:31:18 matt Exp $ */ /* $NetBSD: nfs_serv.c,v 1.68 2003/03/28 13:05:47 yamt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -59,7 +59,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.67 2003/02/26 06:31:18 matt Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.68 2003/03/28 13:05:47 yamt Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -364,7 +364,8 @@ nfsrv_lookup(nfsd, slp, procp, mrq)
u_int32_t *tl; u_int32_t *tl;
int32_t t1; int32_t t1;
caddr_t bpos; caddr_t bpos;
int error = 0, cache, len, dirattr_ret = 1; int error = 0, cache, dirattr_ret = 1;
uint32_t len;
int v3 = (nfsd->nd_flag & ND_NFSV3), pubflag; int v3 = (nfsd->nd_flag & ND_NFSV3), pubflag;
char *cp2; char *cp2;
struct mbuf *mb, *mreq; struct mbuf *mb, *mreq;
@ -587,7 +588,8 @@ nfsrv_read(nfsd, slp, procp, mrq)
int i; int i;
caddr_t bpos; caddr_t bpos;
int error = 0, rdonly, cache, cnt, len, left, siz, tlen, getret; int error = 0, rdonly, cache, cnt, len, left, siz, tlen, getret;
int v3 = (nfsd->nd_flag & ND_NFSV3), reqlen; int v3 = (nfsd->nd_flag & ND_NFSV3);
uint32_t reqlen;
char *cp2; char *cp2;
struct mbuf *mb, *mreq; struct mbuf *mb, *mreq;
struct mbuf *m2; struct mbuf *m2;
@ -1732,7 +1734,8 @@ nfsrv_rename(nfsd, slp, procp, mrq)
u_int32_t *tl; u_int32_t *tl;
int32_t t1; int32_t t1;
caddr_t bpos; caddr_t bpos;
int error = 0, cache, len, len2, fdirfor_ret = 1, fdiraft_ret = 1; int error = 0, cache, fdirfor_ret = 1, fdiraft_ret = 1;
uint32_t len, len2;
int tdirfor_ret = 1, tdiraft_ret = 1; int tdirfor_ret = 1, tdiraft_ret = 1;
int v3 = (nfsd->nd_flag & ND_NFSV3); int v3 = (nfsd->nd_flag & ND_NFSV3);
char *cp2; char *cp2;
@ -1784,7 +1787,15 @@ nfsrv_rename(nfsd, slp, procp, mrq)
} }
fvp = fromnd.ni_vp; fvp = fromnd.ni_vp;
nfsm_srvmtofh(tfhp); nfsm_srvmtofh(tfhp);
nfsm_strsiz(len2, NFS_MAXNAMLEN); if (v3) {
nfsm_dissect(tl, uint32_t *, NFSX_UNSIGNED);
len2 = fxdr_unsigned(uint32_t, *tl);
/* len2 will be checked by nfs_namei */
}
else {
/* NFSv2 */
nfsm_strsiz(len2, NFS_MAXNAMLEN);
}
cred->cr_uid = saved_uid; cred->cr_uid = saved_uid;
tond.ni_cnd.cn_cred = cred; tond.ni_cnd.cn_cred = cred;
tond.ni_cnd.cn_nameiop = RENAME; tond.ni_cnd.cn_nameiop = RENAME;
@ -2042,7 +2053,8 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
char *bpos, *pathcp = NULL, *cp2; char *bpos, *pathcp = NULL, *cp2;
struct uio io; struct uio io;
struct iovec iv; struct iovec iv;
int error = 0, cache, len, len2, dirfor_ret = 1, diraft_ret = 1; int error = 0, cache, dirfor_ret = 1, diraft_ret = 1;
uint32_t len, len2;
int v3 = (nfsd->nd_flag & ND_NFSV3); int v3 = (nfsd->nd_flag & ND_NFSV3);
struct mbuf *mb, *mreq; struct mbuf *mb, *mreq;
struct vnode *dirp = (struct vnode *)0; struct vnode *dirp = (struct vnode *)0;
@ -2071,9 +2083,20 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
if (error) if (error)
goto out; goto out;
VATTR_NULL(&va); VATTR_NULL(&va);
if (v3) if (v3) {
nfsm_srvsattr(&va); nfsm_srvsattr(&va);
nfsm_strsiz(len2, NFS_MAXPATHLEN); nfsm_dissect(tl, uint32_t *, NFSX_UNSIGNED);
len2 = fxdr_unsigned(uint32_t, *tl);
if (len2 > PATH_MAX) {
/* XXX should check _PC_NO_TRUNC */
error = ENAMETOOLONG;
goto abortop;
}
}
else {
/* NFSv2 */
nfsm_strsiz(len2, NFS_MAXPATHLEN);
}
pathcp = malloc(len2 + 1, M_TEMP, M_WAITOK); pathcp = malloc(len2 + 1, M_TEMP, M_WAITOK);
iv.iov_base = pathcp; iv.iov_base = pathcp;
iv.iov_len = len2; iv.iov_len = len2;
@ -2091,13 +2114,15 @@ nfsrv_symlink(nfsd, slp, procp, mrq)
} }
*(pathcp + len2) = '\0'; *(pathcp + len2) = '\0';
if (nd.ni_vp) { if (nd.ni_vp) {
error = EEXIST;
abortop:
VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd); VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
if (nd.ni_dvp == nd.ni_vp) if (nd.ni_dvp == nd.ni_vp)
vrele(nd.ni_dvp); vrele(nd.ni_dvp);
else else
vput(nd.ni_dvp); vput(nd.ni_dvp);
vrele(nd.ni_vp); if (nd.ni_vp)
error = EEXIST; vrele(nd.ni_vp);
goto out; goto out;
} }
nqsrv_getl(nd.ni_dvp, ND_WRITE); nqsrv_getl(nd.ni_dvp, ND_WRITE);

6
sys/nfs/nfs_subs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_subs.c,v 1.109 2003/02/26 06:31:19 matt Exp $ */ /* $NetBSD: nfs_subs.c,v 1.110 2003/03/28 13:05:48 yamt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -74,7 +74,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.109 2003/02/26 06:31:19 matt Exp $"); __KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.110 2003/03/28 13:05:48 yamt Exp $");
#include "fs_nfs.h" #include "fs_nfs.h"
#include "opt_nfs.h" #include "opt_nfs.h"
@ -1880,7 +1880,7 @@ int
nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, retdirp, p, kerbflag, pubflag) nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, retdirp, p, kerbflag, pubflag)
struct nameidata *ndp; struct nameidata *ndp;
fhandle_t *fhp; fhandle_t *fhp;
int len; uint32_t len;
struct nfssvc_sock *slp; struct nfssvc_sock *slp;
struct mbuf *nam; struct mbuf *nam;
struct mbuf **mdp; struct mbuf **mdp;

16
sys/nfs/nfsm_subs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfsm_subs.h,v 1.24 2003/02/26 07:33:57 matt Exp $ */ /* $NetBSD: nfsm_subs.h,v 1.25 2003/03/28 13:05:48 yamt Exp $ */
/* /*
* Copyright (c) 1989, 1993 * Copyright (c) 1989, 1993
@ -296,26 +296,24 @@
#define nfsm_strsiz(s,m) \ #define nfsm_strsiz(s,m) \
{ nfsm_dissect(tl,u_int32_t *,NFSX_UNSIGNED); \ { nfsm_dissect(tl,uint32_t *,NFSX_UNSIGNED); \
if (((s) = fxdr_unsigned(int32_t,*tl)) > (m)) { \ if (((s) = fxdr_unsigned(uint32_t,*tl)) > (m)) { \
m_freem(mrep); \ m_freem(mrep); \
error = EBADRPC; \ error = EBADRPC; \
goto nfsmout; \ goto nfsmout; \
} } } }
#define nfsm_srvstrsiz(s,m) \ #define nfsm_srvstrsiz(s,m) \
{ nfsm_dissect(tl,u_int32_t *,NFSX_UNSIGNED); \ { nfsm_dissect(tl,uint32_t *,NFSX_UNSIGNED); \
if (((s) = fxdr_unsigned(int32_t,*tl)) > (m) || (s) <= 0) { \ if (((s) = fxdr_unsigned(uint32_t,*tl)) > (m) || (s) <= 0) { \
error = EBADRPC; \ error = EBADRPC; \
nfsm_reply(0); \ nfsm_reply(0); \
} } } }
#define nfsm_srvnamesiz(s) \ #define nfsm_srvnamesiz(s) \
{ nfsm_dissect(tl,u_int32_t *,NFSX_UNSIGNED); \ { nfsm_dissect(tl,uint32_t *,NFSX_UNSIGNED); \
if (((s) = fxdr_unsigned(int32_t,*tl)) > NFS_MAXNAMLEN) \ if (((s) = fxdr_unsigned(uint32_t,*tl)) > NFS_MAXNAMLEN) \
error = NFSERR_NAMETOL; \ error = NFSERR_NAMETOL; \
if ((s) <= 0) \
error = EBADRPC; \
if (error) \ if (error) \
nfsm_reply(0); \ nfsm_reply(0); \
} }