Commit 53cb2454 authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by Anna Schumaker
Browse files

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: aa9c2669 ("NFS: Client implementation of Labeled-NFS")
Signed-off-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Reviewed-by: default avatarJames Morris <jamorris@linux.microsoft.com>
Reviewed-by: default avatarPaul Moore <paul@paul-moore.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent b6f80a2e

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -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,