summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorOndrej Mosnacek <omosnace@redhat.com>2021-01-15 18:43:56 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-17 16:07:23 +0100
commit7bc24880f734512e9d778a1babb1b11dee9d019a (patch)
tree87f746336835b6693212f298948887440e4589f1 /fs
parente46a69d2e5ead7afe56c1635e42dca4a883dfe1d (diff)
downloadlinux-stable-7bc24880f734512e9d778a1babb1b11dee9d019a.tar.gz
linux-stable-7bc24880f734512e9d778a1babb1b11dee9d019a.tar.bz2
linux-stable-7bc24880f734512e9d778a1babb1b11dee9d019a.zip
NFSv4.2: fix return value of _nfs4_get_security_label()
[ Upstream commit 53cb245454df5b13d7063162afd7a785aed6ebf2 ] An xattr 'get' handler is expected to return the length of the value on success, yet _nfs4_get_security_label() (and consequently also nfs4_xattr_get_nfs4_label(), which is used as an xattr handler) returns just 0 on success. Fix this by returning label.len instead, which contains the length of the result. Fixes: aa9c2669626c ("NFS: Client implementation of Labeled-NFS") Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> Reviewed-by: James Morris <jamorris@linux.microsoft.com> Reviewed-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfs/nfs4proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 3c15291ba1aa..0c9386978d9d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -4922,7 +4922,7 @@ static int _nfs4_get_security_label(struct inode *inode, void *buf,
return ret;
if (!(fattr.valid & NFS_ATTR_FATTR_V4_SECURITY_LABEL))
return -ENOENT;
- return 0;
+ return label.len;
}
static int nfs4_get_security_label(struct inode *inode, void *buf,