From 7dac89cb0aa25322c8162de1da49e410b3c132ef Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Tue, 11 May 2021 16:33:10 +0800 Subject: [PATCH] NFSv4.2: fix return value of _nfs4_get_security_label() stable inclusion from linux-4.19.181 commit 2a71011eb68eaf5de554c4080e8d74b2572783b0 -------------------------------- [ 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 Reviewed-by: James Morris Reviewed-by: Paul Moore Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin Signed-off-by: Yang Yingliang Reviewed-by: Hou Tao Signed-off-by: Yang Yingliang --- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d6abca23406e..9b819774f7f6 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5602,7 +5602,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, -- GitLab