summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorOndrej Mosnacek <omosnace@redhat.com>2021-01-15 20:43:56 +0300
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2021-03-09 21:30:39 +0300
commit53cb245454df5b13d7063162afd7a785aed6ebf2 (patch)
tree6b7b6063912150a62d55d6b31c15e6ccb28b1475 /fs
parentb6f80a2ebb97f184c4679518ac83074598bf9bf4 (diff)
downloadlinux-53cb245454df5b13d7063162afd7a785aed6ebf2.tar.xz
NFSv4.2: fix return value of _nfs4_get_security_label()
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>
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 6d8fc56e5f45..1002c4f66f3f 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -5965,7 +5965,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,