| Message ID | 20150508001623.31129.24710.stgit@notabene.brown (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri 08-05-15 10:16:23, NeilBrown wrote: > The "fh_len" passed to ->fh_to_* is not guaranteed to be that same as > that returned by encode_fh - it may be larger. > > With NFSv2, the filehandle is fixed length, so it may appear longer > than expected and be zero-padded. > > So we must test that fh_len is at least some value, not exactly equal > to it. > > Signed-off-by: NeilBrown <neilb@suse.de> Thanks. The patch looks good to me. I've added it to my tree. Honza > --- > fs/udf/namei.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/udf/namei.c b/fs/udf/namei.c > index 5c03f0dfb98b..facc2a840f7b 100644 > --- a/fs/udf/namei.c > +++ b/fs/udf/namei.c > @@ -1221,7 +1221,7 @@ static struct dentry *udf_nfs_get_inode(struct super_block *sb, u32 block, > static struct dentry *udf_fh_to_dentry(struct super_block *sb, > struct fid *fid, int fh_len, int fh_type) > { > - if ((fh_len != 3 && fh_len != 5) || > + if (fh_len < 3 || > (fh_type != FILEID_UDF_WITH_PARENT && > fh_type != FILEID_UDF_WITHOUT_PARENT)) > return NULL; > @@ -1233,7 +1233,7 @@ static struct dentry *udf_fh_to_dentry(struct super_block *sb, > static struct dentry *udf_fh_to_parent(struct super_block *sb, > struct fid *fid, int fh_len, int fh_type) > { > - if (fh_len != 5 || fh_type != FILEID_UDF_WITH_PARENT) > + if (fh_len < 5 || fh_type != FILEID_UDF_WITH_PARENT) > return NULL; > > return udf_nfs_get_inode(sb, fid->udf.parent_block, > >
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index 5c03f0dfb98b..facc2a840f7b 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c @@ -1221,7 +1221,7 @@ static struct dentry *udf_nfs_get_inode(struct super_block *sb, u32 block, static struct dentry *udf_fh_to_dentry(struct super_block *sb, struct fid *fid, int fh_len, int fh_type) { - if ((fh_len != 3 && fh_len != 5) || + if (fh_len < 3 || (fh_type != FILEID_UDF_WITH_PARENT && fh_type != FILEID_UDF_WITHOUT_PARENT)) return NULL; @@ -1233,7 +1233,7 @@ static struct dentry *udf_fh_to_dentry(struct super_block *sb, static struct dentry *udf_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type) { - if (fh_len != 5 || fh_type != FILEID_UDF_WITH_PARENT) + if (fh_len < 5 || fh_type != FILEID_UDF_WITH_PARENT) return NULL; return udf_nfs_get_inode(sb, fid->udf.parent_block,
The "fh_len" passed to ->fh_to_* is not guaranteed to be that same as that returned by encode_fh - it may be larger. With NFSv2, the filehandle is fixed length, so it may appear longer than expected and be zero-padded. So we must test that fh_len is at least some value, not exactly equal to it. Signed-off-by: NeilBrown <neilb@suse.de> --- fs/udf/namei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html