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 4C4EE3DE450; Mon, 4 May 2026 14:22:43 +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=1777904563; cv=none; b=C+oyawKPE7VECEsKcWS3DKQbPNFUG5aN1fBFvY8NV5K/4G04/61g7/3JmnCSvrsjTIIrANnAssS2FA7t33MItDmWIYsiZ4BVVLii+uxqdQekC+APf6yOT67czVg2KZ/PVt3lzUA1mquyOY3nt3/7OxSdkNXbJJXQQFqiTKsN9z4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777904563; c=relaxed/simple; bh=JyWyk2YiKLXg9xy1lPJywczN4zTn8fuTFevqNIuHNYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AkUnJ+5cI6hqmkQqzWPFlXZh4rPYFVWO1xHWwYZPyZ2YVMdjWPNFUHqeycdNA3NTVWyetIFy++zYXtivuLLD97+/SukqttjIP2E1tW7c/T8iwi5CTu3aRJCo49L+cFSpfWWZ6uZdMdKcK68ZmeERI1z22V++2eBWJ9+Iz6q4bKI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DCrjxb9w; 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="DCrjxb9w" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7CECC2BCB8; Mon, 4 May 2026 14:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777904563; bh=JyWyk2YiKLXg9xy1lPJywczN4zTn8fuTFevqNIuHNYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DCrjxb9wGuR/L7uCQlaye6L1doHKUW/urYtdhqDg5WWB0ZZvQnn0KQylG71w7L3md 4lQ6MtkTehwIVSoFK3rVA03MFLLu3XDfv+f/3w5qJD7wr9GPpRQBu0M75Cbln9tAyU jzi9D6slmifchB5Fes8IcQXU/jLE/Cpe7ThRV6w4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Yifan Wu , Juefei Pu , Xin Liu , Ao Zhou , Ren Wei , Allison Henderson , Jakub Kicinski Subject: [PATCH 6.12 087/215] net: rds: fix MR cleanup on copy error Date: Mon, 4 May 2026 15:51:46 +0200 Message-ID: <20260504135133.337566732@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135130.169210693@linuxfoundation.org> References: <20260504135130.169210693@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ao Zhou commit 8141a2dc70080eda1aedc0389ed2db2b292af5bd upstream. __rds_rdma_map() hands sg/pages ownership to the transport after get_mr() succeeds. If copying the generated cookie back to user space fails after that point, the error path must not free those resources again before dropping the MR reference. Remove the duplicate unpin/free from the put_user() failure branch so that MR teardown is handled only through the existing final cleanup path. Fixes: 0d4597c8c5ab ("net/rds: Track user mapped pages through special API") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Yifan Wu Reported-by: Juefei Pu Reported-by: Xin Liu Signed-off-by: Ao Zhou Signed-off-by: Ren Wei Reviewed-by: Allison Henderson Link: https://patch.msgid.link/79c8ef73ec8e5844d71038983940cc2943099baf.1776764247.git.draw51280@163.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/rds/rdma.c | 4 ---- 1 file changed, 4 deletions(-) --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -326,10 +326,6 @@ static int __rds_rdma_map(struct rds_soc if (args->cookie_addr && put_user(cookie, (u64 __user *)(unsigned long)args->cookie_addr)) { - if (!need_odp) { - unpin_user_pages(pages, nr_pages); - kfree(sg); - } ret = -EFAULT; goto out; }