From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CCA627703A; Tue, 12 Aug 2025 19:23:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026590; cv=none; b=Q/9Blz4vUchdifzWNsfcdUkLZl2I6bLifDfpSy8RtApf+w2ik1dgiUeagY/q75HoCmo1KVplYMpHTbzntw7Ow7sGGtQLUIEwrYQrx2dIO35RjZsn3O2I4wdwe1PLPyxv/vNcb16CIJnAolHTUlRK6GUYKvcO4ADufaDbnglzEBA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026590; c=relaxed/simple; bh=WFI/kdE7f5pivGuD63RZi5t44xpwOSekJokwYUuiRPg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=olRm3ycx++I/gtxYdVwBP70R+QXArDa31rFWs8ja1XndXouk6lVvanZbYyxMOah+RFgc0k/aTcDJTl1A6I+R7O1Q88FjdxtUaHFz6jpjIB5BRPcAebl1vigDocO3BboNaBDyduKq7uoJvU10F8qTLmksfZDGxA/ZTm3otmI0aPo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cji2U3ks; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cji2U3ks" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B09A5C4CEF0; Tue, 12 Aug 2025 19:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755026590; bh=WFI/kdE7f5pivGuD63RZi5t44xpwOSekJokwYUuiRPg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cji2U3ks7TVeuUexQIzVgy41dFfLc6xHipl3Q7Eqj2AjeuYuqpvco/mMnE8ZRW0Ot q3OL3iovqn5P8UWxJ3kc7SnI8GAimsHFjPZEj3uhaOO+szzu6ic/PkQH4nbYKcz2Zl J6JUqRE5dmkPum8s+0jp8r+Y8IgQr0hSdHhdOcO8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Olga Kornievskaia , Trond Myklebust , Sasha Levin Subject: [PATCH 6.15 383/480] NFSv4.2: another fix for listxattr Date: Tue, 12 Aug 2025 19:49:51 +0200 Message-ID: <20250812174413.224221357@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Olga Kornievskaia [ Upstream commit 9acb237deff7667b0f6b10fe6b1b70c4429ea049 ] Currently, when the server supports NFS4.1 security labels then security.selinux label in included twice. Instead, only add it when the server doesn't possess security label support. Fixes: 243fea134633 ("NFSv4.2: fix listxattr to return selinux security label") Signed-off-by: Olga Kornievskaia Link: https://lore.kernel.org/r/20250722205641.79394-1-okorniev@redhat.com Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4proc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 2f5a6aa3fd48..3c1ef174aa81 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -10866,7 +10866,7 @@ const struct nfs4_minor_version_ops *nfs_v4_minor_ops[] = { static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size) { - ssize_t error, error2, error3, error4; + ssize_t error, error2, error3, error4 = 0; size_t left = size; error = generic_listxattr(dentry, list, left); @@ -10894,9 +10894,11 @@ static ssize_t nfs4_listxattr(struct dentry *dentry, char *list, size_t size) left -= error3; } - error4 = security_inode_listsecurity(d_inode(dentry), list, left); - if (error4 < 0) - return error4; + if (!nfs_server_capable(d_inode(dentry), NFS_CAP_SECURITY_LABEL)) { + error4 = security_inode_listsecurity(d_inode(dentry), list, left); + if (error4 < 0) + return error4; + } error += error2 + error3 + error4; if (size && error > size) -- 2.39.5