diff options
| author |  Amir Goldstein <amir73il@gmail.com>
| 2023-05-24 18:48:25 +0300 |
|---|---|---|
| committer |  Jan Kara <jack@suse.cz>
| 2023-05-25 13:17:04 +0200 |
| commit | 7cdafe6cc4a6ee94c56a5c96d6edd80d066d5a3b (patch) | |
| tree | f1e0b02718ede6480fc58517d9a8e38f8edc71a7 /fs/nfsd | |
| parent | fanotify: support reporting non-decodeable file handles (diff) | |
| download | linux-7cdafe6cc4a6ee94c56a5c96d6edd80d066d5a3b.tar.gz linux-7cdafe6cc4a6ee94c56a5c96d6edd80d066d5a3b.tar.bz2 linux-7cdafe6cc4a6ee94c56a5c96d6edd80d066d5a3b.zip | |
exportfs: check for error return value from exportfs_encode_*()
The exportfs_encode_*() helpers call the filesystem ->encode_fh()
method which returns a signed int.
All the in-tree implementations of ->encode_fh() return a positive
integer and FILEID_INVALID (255) for error.
Fortify the callers for possible future ->encode_fh() implementation
that will return a negative error value.
name_to_handle_at() would propagate the returned error to the users
if filesystem ->encode_fh() method returns an error.
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://lore.kernel.org/linux-fsdevel/ca02955f-1877-4fde-b453-3c1d22794740@kili.mountain/
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Message-Id: <20230524154825.881414-1-amir73il@gmail.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfsfh.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 31e4505c0df3..0f5eacae5f43 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -416,9 +416,11 @@ static void _fh_update(struct svc_fh *fhp, struct svc_export *exp, int maxsize = (fhp->fh_maxsize - fhp->fh_handle.fh_size)/4; int fh_flags = (exp->ex_flags & NFSEXP_NOSUBTREECHECK) ? 0 : EXPORT_FH_CONNECTABLE; + int fileid_type = + exportfs_encode_fh(dentry, fid, &maxsize, fh_flags); fhp->fh_handle.fh_fileid_type = - exportfs_encode_fh(dentry, fid, &maxsize, fh_flags); + fileid_type > 0 ? fileid_type : FILEID_INVALID; fhp->fh_handle.fh_size += maxsize * 4; } else { fhp->fh_handle.fh_fileid_type = FILEID_ROOT; |