UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd_readlink(): switch to vfs_get_link() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-05-27 16:11:23 -04:00
parent 104289576b
commit 4d7edbc34c
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fs/nfsd/vfs.c
View File

@ -1464,41 +1464,34 @@ do_nfsd_create(struct svc_rqst *rqstp, struct svc_fh *fhp,
__be32 __be32
nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp) nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
{ {
mm_segment_t oldfs;
__be32 err; __be32 err;
int host_err; const char *link;
struct path path; struct path path;
DEFINE_DELAYED_CALL(done);
int len;
err = fh_verify(rqstp, fhp, S_IFLNK, NFSD_MAY_NOP); err = fh_verify(rqstp, fhp, S_IFLNK, NFSD_MAY_NOP);
if (err) if (unlikely(err))
goto out; return err;
path.mnt = fhp->fh_export->ex_path.mnt; path.mnt = fhp->fh_export->ex_path.mnt;
path.dentry = fhp->fh_dentry; path.dentry = fhp->fh_dentry;
err = nfserr_inval; if (unlikely(!d_is_symlink(path.dentry)))
if (!d_is_symlink(path.dentry)) return nfserr_inval;
goto out;
touch_atime(&path); touch_atime(&path);
/* N.B. Why does this call need a get_fs()??
* Remove the set_fs and watch the fireworks:-) --okir
*/
oldfs = get_fs(); set_fs(KERNEL_DS); link = vfs_get_link(path.dentry, &done);
host_err = vfs_readlink(path.dentry, (char __user *)buf, *lenp); if (IS_ERR(link))
set_fs(oldfs); return nfserrno(PTR_ERR(link));
if (host_err < 0) len = strlen(link);
goto out_nfserr; if (len < *lenp)
*lenp = host_err; *lenp = len;
err = 0; memcpy(buf, link, *lenp);
out: do_delayed_call(&done);
return err; return 0;
out_nfserr:
err = nfserrno(host_err);
goto out;
} }
/* /*