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=1795053063; b=IDAafPH5/GHl2h3LaIWY4drUT8DNmDm6BTLLYID8T0rZI4JZy3eNUqGdvwPr/ZXNw1rM E1vPKwE51xHS1BdEU2mR2CQ4YXnmdqf8R1Tui8OXYm+GsIyIpnRKgmGUFthaf2YroG9fp 25o8oLiho64Wox93zMEBPsFYGJRsQUSShJHoioOh9mh4EnN8vsnFzUBInzzdHUSqrTVvH plBLSMnHNQxv0pwkucdzePG633ryDoJbEvN8y8Jm5DBI4GB4RInTe7th6ez9HNfav010l ff+lVHS7/tZrSJAFSe8dD/kBsysM57/Kd5Ad2Y7LrvzhaAXNKUg1ercsthS1wbYbdWQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053063; 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=ZzeSZRRapcMKtdEzbS4Ym4cotnoO4hJy/6qfclIpstY=; b=AJvS+wXK5/QlP9gSrsXk7xedX183WIkU71epRR86KwH9M7GuxNJBJ0Tz0xmN/WL5po5J F2I9ERdoEZ5oBPYS5ABTXWVGSwFxVHsP8dgWV/YocFMwRaKZKXe6ew0eGQ/GXdplOHnrl B/AzPI6ZFLQN3jqq1Fy7QptdPX0wwUmcqelcCwQUJCW+3l9Hwbgi0eAaWpaxwcggySL9S yKPuWr/dqU0coYJvfcABGjY8c0yDPt1OpFOtEDpHyU7tTnsFCeOrT9xXa73F4EewjGo0M EwvaH4Iul8/MNa8k5CFK63tNY4xrO/30LNNC9O4DlooU9d6wfG+iVpDQVMB9K06K0Og== 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=m1S4QmXv; 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 2C82F606A31C; Thu, 19 Nov 2026 01:51:02 +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=m1S4QmXv Received: by smtp.kernel.org (Postfix) with ESMTPSA id 367FD1F000C4; Thu, 19 Nov 2026 01:51:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053062; bh=ZzeSZRRapcMKtdEzbS4Ym4cotnoO4hJy/6qfclIpstY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=m1S4QmXvjh8YtqUeYZn9LgaOw0WyRYURXHz1Mg0GkV2Ifx9k0AlLodnfCm5pW5wN6 UhiOB2HcZk/zm0mQ/44a8gcntQtRvVB6vKIoRzJSSt1r+DHHwMTizqTrZbU9VwEnaf 5jzJN76BUKkjCtubUPImnYnl8u4zYV1meOqzOh9g= 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.15 0783/2214] NFSD: Move the cld upcall message out of the callers stack frame Date: Wed, 18 Nov 2026 15:40:59 +0100 Message-ID: <20261118150042.931176540@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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.15-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 21917c024fb20..abbde09d25f35 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