Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058841; b=rou1Ee9Vd94T7Hx/MEEz4yk3kj5Olhv6BVY744MG/DFBHJRt587UpOCD6vqN+yvq5zgt zkOUQkRVa/Y0SNN7YMqyHEILVWyNAKGw8WrHb8fdssNvKDRXDXshgGeNPuBbFxEtbk055 UesgCqsZ40559eY1WUDgCcKI7GIXPL/XbrpHS0AWU2YKob4CG7hyVL2S38+RGMB/w6sJ4 g0pl2Y3iCwvXb59g9fxbVxIlRELXuNjpVhH4jP/cEYFwkyTA2ImD9v8PNBEC1RIGGzP3T ATAYoiRNFvLVsLzNKDM6c4Tbda+RqBXSNkGtZMGR0Nn+RFTRv4XE3vDujLjYBCo7GRQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058841; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=i1dUKFkXdYoPBlz5DQOooFDecJmWReUT6wuwuO2Tdn8=; b=W4+5WAqj/VIJLhvFtz2Lh9FqMSnN7nlDyjO1Ny5+qrbg6dmWJqsHPBtdoselwayqNaqe PmvkHOqeB0BGn0EQ5RMjCOpBlbRePTBv8S0WFSRm3TLgaP4MZFr20Lht2UJWioXhLrUfN fZXrbHDs89KZJ2hClz7Z7Aqi/DbjIMHSYnHZchX0utKElSrjjOrgH69BOTL9/KhM+mpBN SAmaiyKCx6D6cf0kyXMgIH7riYDABbMKia6sAl3wpP1POyBUxCtP4EQZREWtnO4PM7pZ3 McvaAzkL61ypIOHRCWH7kz3EIJnxfU9WHd6wb2rv50itc9Q3PLpKxU1vgGHSwqoHv/w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=VcsnOOKE; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7126606A331; Thu, 19 Nov 2026 03:27:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=VcsnOOKE Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0434F1F000C5; Thu, 19 Nov 2026 03:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058841; bh=i1dUKFkXdYoPBlz5DQOooFDecJmWReUT6wuwuO2Tdn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VcsnOOKE8eLsxM/+nelutoIZ6sU60fj8h3scANZqnY++yaJbAHgowZ7M+ucqHzE+i fmY3c5JL9AiYioGgSQu9LC9WJOkx4x0pjpdfDqbD5iHQF4X92YbPanHnVnT9UiCw1H OWw/kboWdqvxiR2M5MY87GuOnjRMnzYW6qN1Uhrk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+d5c77cabf7a3492aa650@syzkaller.appspotmail.com, Chuck Lever , Sasha Levin Subject: [PATCH 5.10 0631/1848] NFSD: Move the cld upcall message out of the callers stack frame Date: Wed, 18 Nov 2026 15:44:29 +0100 Message-ID: <20261118145942.046308217@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever [ Upstream commit c559b05610557fa3c6c30259261f6dae523b3f23 ] __cld_pipe_upcall() builds its struct rpc_pipe_msg on the stack and hands it to rpc_queue_upcall(), which links it into a list the pipe owns until the message is released. Only the completion rules keep that frame alive for as long as the pipe refers to it, and the peer that drives those rules is an untrusted userspace daemon. The gss and idmap upcalls do not take that on: each keeps the message in the object it already allocates. Do the same here and put the message in struct cld_upcall, beside the reply buffer it carries. cld_pipe_destroy_msg() then reaches the upcall from the message directly rather than through msg->data. Reported-by: syzbot+d5c77cabf7a3492aa650@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=d5c77cabf7a3492aa650 Link: https://patch.msgid.link/20260901-alemi-v2-2-e163f94a3a6e@kernel.org Signed-off-by: Chuck Lever Stable-dep-of: 2a83fcb50f3c ("NFSD: Complete a cld upcall when the daemon closes the pipe") Signed-off-by: Sasha Levin --- fs/nfsd/nfs4recover.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 54815ce3da035..5cedbea8911ec 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c @@ -720,6 +720,7 @@ struct cld_upcall { struct completion cu_done; /* daemon has read the whole upcall; protected by cn_lock */ bool cu_inflight; + struct rpc_pipe_msg cu_pipe_msg; union { struct cld_msg_hdr cu_hdr; struct cld_msg cu_msg; @@ -731,22 +732,22 @@ static int __cld_pipe_upcall(struct rpc_pipe *pipe, void *cmsg, struct nfsd_net *nn) { int ret; - struct rpc_pipe_msg msg; struct cld_upcall *cup = container_of(cmsg, struct cld_upcall, cu_u); + struct rpc_pipe_msg *msg = &cup->cu_pipe_msg; - memset(&msg, 0, sizeof(msg)); - msg.data = cmsg; - msg.len = nn->client_tracking_ops->msglen; + memset(msg, 0, sizeof(*msg)); + msg->data = cmsg; + msg->len = nn->client_tracking_ops->msglen; - ret = rpc_queue_upcall(pipe, &msg); + ret = rpc_queue_upcall(pipe, msg); if (ret < 0) { goto out; } wait_for_completion(&cup->cu_done); - if (msg.errno < 0) - ret = msg.errno; + if (msg->errno < 0) + ret = msg->errno; out: return ret; } @@ -918,9 +919,8 @@ cld_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) static void cld_pipe_destroy_msg(struct rpc_pipe_msg *msg) { - struct cld_msg *cmsg = msg->data; - struct cld_upcall *cup = container_of(cmsg, struct cld_upcall, - cu_u.cu_msg); + struct cld_upcall *cup = container_of(msg, struct cld_upcall, + cu_pipe_msg); struct cld_net *cn = cup->cu_net; /* -- 2.53.0