Commit b8da0d1c authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

knfsd: Validate filehandle type in fsid_source

fsid_source decided where to get the 'fsid' number to
return for a GETATTR based on the type of filehandle.
It can be from the device, from the fsid, or from the
UUID.

It is possible for the filehandle to be inconsistent
with the export information, so make sure the export information
actually has the info implied by the value returned by
fsid_source.
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Cc: "Luiz Fernando N. Capitulino" <lcapitulino@gmail.com>
Signed-off-by: default avatar"J. Bruce Fields" <bfields@citi.umich.edu>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1033be7
...@@ -566,13 +566,23 @@ enum fsid_source fsid_source(struct svc_fh *fhp) ...@@ -566,13 +566,23 @@ enum fsid_source fsid_source(struct svc_fh *fhp)
case FSID_DEV: case FSID_DEV:
case FSID_ENCODE_DEV: case FSID_ENCODE_DEV:
case FSID_MAJOR_MINOR: case FSID_MAJOR_MINOR:
return FSIDSOURCE_DEV; if (fhp->fh_export->ex_dentry->d_inode->i_sb->s_type->fs_flags
& FS_REQUIRES_DEV)
return FSIDSOURCE_DEV;
break;
case FSID_NUM: case FSID_NUM:
return FSIDSOURCE_FSID;
default:
if (fhp->fh_export->ex_flags & NFSEXP_FSID) if (fhp->fh_export->ex_flags & NFSEXP_FSID)
return FSIDSOURCE_FSID; return FSIDSOURCE_FSID;
else break;
return FSIDSOURCE_UUID; default:
break;
} }
/* either a UUID type filehandle, or the filehandle doesn't
* match the export.
*/
if (fhp->fh_export->ex_flags & NFSEXP_FSID)
return FSIDSOURCE_FSID;
if (fhp->fh_export->ex_uuid)
return FSIDSOURCE_UUID;
return FSIDSOURCE_DEV;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment