GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-04-06 14:25:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

exportfs: be careful to only return expected errors.

Browse source 
When nfsd calls fh_to_dentry, it expect ESTALE or ENOMEM as errors.
In particular it can be tempting to return ENOENT, but this is not
handled well by nfsd.

Rather than requiring strict adherence to error code code filesystems,
treat all unexpected error codes the same as ESTALE.  This is safest.

Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
NeilBrown 2016-08-04 10:19:06 +10:00 • committed by J. Bruce Fields
parent 7d22fc11c7
commit 09bb8bfffd
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/exportfs/expfs.c
View file

@ -428,10 +428,10 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,
if (!nop || !nop->fh_to_dentry) if (!nop || !nop->fh_to_dentry)
return ERR_PTR(-ESTALE); return ERR_PTR(-ESTALE);
result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type); result = nop->fh_to_dentry(mnt->mnt_sb, fid, fh_len, fileid_type);
if (!result) if (PTR_ERR(result) == -ENOMEM)
result = ERR_PTR(-ESTALE); return ERR_CAST(result);
if (IS_ERR(result)) if (IS_ERR_OR_NULL(result))
return result; return ERR_PTR(-ESTALE);
if (d_is_dir(result)) { if (d_is_dir(result)) {
/* /*
@ -541,6 +541,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,
err_result: err_result:
dput(result); dput(result);
if (err != -ENOMEM)
err = -ESTALE;
return ERR_PTR(err); return ERR_PTR(err);
} }
EXPORT_SYMBOL_GPL(exportfs_decode_fh); EXPORT_SYMBOL_GPL(exportfs_decode_fh);

13
include/linux/exportfs.h
View file

@ -157,12 +157,13 @@ struct fid {
* @fh_to_dentry is given a &struct super_block (@sb) and a file handle * @fh_to_dentry is given a &struct super_block (@sb) and a file handle
* fragment (@fh, @fh_len). It should return a &struct dentry which refers * fragment (@fh, @fh_len). It should return a &struct dentry which refers
* to the same file that the file handle fragment refers to. If it cannot, * to the same file that the file handle fragment refers to. If it cannot,
* it should return a %NULL pointer if the file was found but no acceptable * it should return a %NULL pointer if the file cannot be found, or an
* &dentries were available, or an %ERR_PTR error code indicating why it * %ERR_PTR error code of %ENOMEM if a memory allocation failure occurred.
* couldn't be found (e.g. %ENOENT or %ENOMEM). Any suitable dentry can be * Any other error code is treated like %NULL, and will cause an %ESTALE error
* returned including, if necessary, a new dentry created with d_alloc_root. * for callers of exportfs_decode_fh().
* The caller can then find any other extant dentries by following the * Any suitable dentry can be returned including, if necessary, a new dentry
* d_alias links. * created with d_alloc_root. The caller can then find any other extant
* dentries by following the d_alias links.
* *
* fh_to_parent: * fh_to_parent:
* Same as @fh_to_dentry, except that it returns a pointer to the parent * Same as @fh_to_dentry, except that it returns a pointer to the parent