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 22E3C377575; Mon, 4 May 2026 14:12:21 +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=1777903941; cv=none; b=dMnnrBGyQYiH+oAZScB18BixszGbKsjbToGiuDfHRviJRPVwHfb08OE59rDG4RdYteFEt4pTsEdYYACbjuhWu4P9G78eixX2KU8yeDhYXLLFvlnwVYiP/Kuq9XM174VFhIRjZqtK0Xc84qhCaYKhpBMvKapTktAUgaFnz0ReSq8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777903941; c=relaxed/simple; bh=bizZ2Jq91v9qkv1U4NzD6rjRxOlwPJNEOPhIaJzgtTI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aMaUbWU+4JE+4RMcqTYL7RUFkJ4+VPorRQuYWmv7hUr4qM5y+AyVkE/5dAHCwVU7He0xHkg0iccX8gNfJlvd1RJn0zZKC9+M4fhXqZ0u0BicUabSdbmNeFTjVTE+AiAWkGDkLMQ5rhvQO94jlvnb8L+kJkQNrdR9hvgs5NOLIP8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cLY0XFeb; 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="cLY0XFeb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADD57C2BCB8; Mon, 4 May 2026 14:12:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777903941; bh=bizZ2Jq91v9qkv1U4NzD6rjRxOlwPJNEOPhIaJzgtTI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cLY0XFebvI1cgDlL8WY/p+Yd1lqDIvrr1xKsfGsGGOIyPyTamupv1ZmMWqBp3Tkpt gNBsgFPOqGzJJutoS3cU7DNGORWKGRBPYGzBqoalbd7aOm01WhuH7g4+YVSi1jt6gh SMpkouJeAkxPeizj5c6ftygG70I3A010RJ9+02Ko= 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.18 120/275] net: rds: fix MR cleanup on copy error Date: Mon, 4 May 2026 15:51:00 +0200 Message-ID: <20260504135147.362844013@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135142.929052779@linuxfoundation.org> References: <20260504135142.929052779@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.18-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; }