From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f176.google.com (mail-dy1-f176.google.com [74.125.82.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 861EE1DD525 for ; Mon, 13 Apr 2026 07:00:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776063623; cv=none; b=oNANpvBusuhI+AOe83IRodMwdfCbePcqWQJpat4F7te6j1tLRaHfeQjjO/Kk0IFwTLkxskodNU+U3hRH5dUYaaQfGOUDH5TCctPQ7QOFI9Usyy+G7AbO5/+i09y3/nraksmRsfNU4T9QRFSKipyTlNq7xbRKKSePxWrmNJ835d0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776063623; c=relaxed/simple; bh=KwPKKI8ujdK13H/nCvSAP0++ttyw8CHmOYPRVTAvVEQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Pg4+iEXfssIGRnqv6yAcsyGXVTkQn7ttOJei1H95/JCGdmjytlaf3McSpgljoSgHxVb8BGvJtk+zr6dFb+mgBAt/U+V1tHeScBeLiIt7/agxy2Vef+ZAP2oOdFGlgGUge4th6izVEusHciHm5T4DcPL9VU/7OYT59+H7cbAn01o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WAuh95Uk; arc=none smtp.client-ip=74.125.82.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WAuh95Uk" Received: by mail-dy1-f176.google.com with SMTP id 5a478bee46e88-2b6b0500e06so7379213eec.1 for ; Mon, 13 Apr 2026 00:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776063621; x=1776668421; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Wcf1iWSRA87AUV2HNsi+KD2GJOFrP0HPCIjQVH9/1OY=; b=WAuh95UkbamVEXg5fTfavwmmeU8lMug+M4R0ijRVEnMLWu+8b8TPfeXAtZhfKoRqGZ 1XBUq13LAkwrpVg8J3Q5mwa/SdU1B/zxiqBshGQc8zmyNPROTg6Fp9olyCqOJsYuF0s9 lPdBFu90i9W5IKaYO13GSJedf2ORXJqZC6m/SLKyHw0kExcPG0vGVzsOQ/wzrdfKeUd9 xWutG4hgT0MlZfVkov/EJX4MDfHctHdSA/ZH3NWnjsLEMod5ovv9SPy22AhIWVGLx15R ViMVnlHVxwo00FSKvIC8rSctNzJHpmjmBkVbtqJ72+8VlrIhr02H6McPn5rv+DWy4oa/ CyFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776063621; x=1776668421; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Wcf1iWSRA87AUV2HNsi+KD2GJOFrP0HPCIjQVH9/1OY=; b=l0trbaMSpTspew48WzH+8cpf+PBaMwwl0FEDBsRkgpnPPphVbgRSGloTPtIzLjZv0w VW52y8fXqbPiQIN0NT6otyDDohzzGuBrfiSbZPah+k8Qi8s6f2BasubSjnaqGMB7lm9z 6HI5giy3CTKFVuXhUzOPp7+Y/Rn1YtAsu8pNdozJPyY+vPqiyUD2ME9a0W070FBPyCvd o39bNyaUYwuZHYYbi8NK8PgjY5MZ/+5UJPTWHCCkplO0Wq9vf+zx3qAZV2fqj9LakVqS 17azlHhzsT0avShPy8kssh3CvmUH5Asr3iMJtqtbRtWu34t5js+dDmcDc87LyAimSfIo Zgcg== X-Forwarded-Encrypted: i=1; AFNElJ9gsheWbhi28TNRUtRuPOQMFFYFTcCpbUdEURZiQml18lMdAQZTA1xFZ28GafMzqjzPwKbyaq1SGwIV83Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyvVSM6H0UmGITXPkilyZmj1io7z8dscI3jMN1FL3OgxJw41R4+ E9RI/aHTNAnikDgJ1W0yjCwFxyIbYoO0kYtGFJ5wOwbzxaDBylcZjhst X-Gm-Gg: AeBDiesxdh3gTV+/8FRliuBtSpcFp9tt/v73ljWwQrtAqK0doj5UJPMylgPR74SAJmn 7lZMr+3DQcx2wPfo7ParzV1tIh0oYpjLFfprGEZzygIPJZ3GTEPQSfJdPhKt/cgM8MdReWFPPqF 98bgWxJokB94YGmng4/XYZbTcEr/WAJ2474wbfmVXoAyDBy9ujtn6USrt/kEQhNShxa/AJyWozH MmWNeOucz6Cy67hm5hSmkL1jPQH1n4xATvYD87hwIIuZymMKVIcWgXi3T/CFU1Hj95vwbe9/o/y 9YGHTkjhdOAyAu8DUO4fceriqX9BVvL7iN58xg3uhpf62wieKZZ18YKgnwSAdMMKweDV5y9NyYn BLpsx06NpBa0GbdJWY+VtCUIwNOyqDaCHaTV4uIc8WounEJOVsJVMHEOHNF2dPJRcJXTP1wadcO 18HV2o3IMrDSgea9My2XnPLYXinBIxKMbGCA== X-Received: by 2002:a05:7022:517:b0:12b:ee92:a60e with SMTP id a92af1059eb24-12c34e89e20mr6767610c88.8.1776063615726; Mon, 13 Apr 2026 00:00:15 -0700 (PDT) Received: from localhost.localdomain ([154.29.155.10]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12c3459f7ffsm12678394c88.3.2026.04.13.00.00.11 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Apr 2026 00:00:14 -0700 (PDT) From: Xiaobo Liu To: Allison Henderson , "David S. Miller" Cc: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, linux-kernel@vger.kernel.org, Xiaobo Liu Subject: [PATCH net v2] RDS: Fix memory leak in rds_rdma_extra_size() Date: Mon, 13 Apr 2026 15:00:05 +0800 Message-ID: <20260413070005.15272-1-cppcoffee@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Free iov->iov when copy_from_user() or page count validation fails in rds_rdma_extra_size(). This preserves the existing success path and avoids leaking the allocated iovec array on error. Signed-off-by: Xiaobo Liu --- net/rds/rdma.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/net/rds/rdma.c b/net/rds/rdma.c index aa6465dc7..91a20c1e2 100644 --- a/net/rds/rdma.c +++ b/net/rds/rdma.c @@ -560,6 +560,7 @@ int rds_rdma_extra_size(struct rds_rdma_args *args, struct rds_iovec *vec; struct rds_iovec __user *local_vec; int tot_pages = 0; + int ret = 0; unsigned int nr_pages; unsigned int i; @@ -578,16 +579,20 @@ int rds_rdma_extra_size(struct rds_rdma_args *args, vec = &iov->iov[0]; if (copy_from_user(vec, local_vec, args->nr_local * - sizeof(struct rds_iovec))) - return -EFAULT; + sizeof(struct rds_iovec))) { + ret = -EFAULT; + goto out; + } iov->len = args->nr_local; /* figure out the number of pages in the vector */ for (i = 0; i < args->nr_local; i++, vec++) { nr_pages = rds_pages_in_vec(vec); - if (nr_pages == 0) - return -EINVAL; + if (nr_pages == 0) { + ret = -EINVAL; + goto out; + } tot_pages += nr_pages; @@ -595,11 +600,20 @@ int rds_rdma_extra_size(struct rds_rdma_args *args, * nr_pages for one entry is limited to (UINT_MAX>>PAGE_SHIFT)+1, * so tot_pages cannot overflow without first going negative. */ - if (tot_pages < 0) - return -EINVAL; + if (tot_pages < 0) { + ret = -EINVAL; + goto out; + } } - return tot_pages * sizeof(struct scatterlist); + ret = tot_pages * sizeof(struct scatterlist); + +out: + if (ret < 0) { + kfree(iov->iov); + iov->iov = NULL; + } + return ret; } /* -- 2.34.1