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 71D743594E; Tue, 12 Aug 2025 19:15:28 +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=1755026128; cv=none; b=qnYvJwL2QXCdmwj/6EmGHYCCwFqu91hUbgFyopRwQJMU9nk5H9zqf0gTOcVnd8UZ4LrO9xaGACQe+gNmvSqrCYSe6OejqKypBAUJHZ7XMNll1MvJ9/PO3PHgVkOyStoksBjO4IXqGS6djAtC0vMh04WBAJuXlrg/F1pxprpbxHI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026128; c=relaxed/simple; bh=oAUHpd0RtEH/oca4lBB22iYNgzhCv/d7DhfM3xVY0DE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RqAO7vp/iYMaTRbOXqTV4/jb0vhf8qbe4itlt3N2gpaNg1gqIAnLOO2B2RsfFeXMUXF8JYBws9x2Icc9EWGt9Rn0q43MlOBLyL+IFm5CQrGQEgiP4qSGnceHcP6DFZzwXmLp2J/gXdNYVNFdA9t2BlqciYrQdp2SgQ7p2HX/ruY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OV9Fu1d9; 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="OV9Fu1d9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75563C4CEF0; Tue, 12 Aug 2025 19:15:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755026127; bh=oAUHpd0RtEH/oca4lBB22iYNgzhCv/d7DhfM3xVY0DE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OV9Fu1d9c3OAPOxLxdqniZXCvn5dKSHkBEl7MVgiO8qFgHFkU8XNUqkGrM8imqN/2 fd8vqFATyNkkDItEjBiv3IGWVsJM7wm530FLi1cVhCZNd3s5wjmyBPTGXCrHkO37DX RwCZECr849AxcTcLz2YyWFb4iaC10mZErgzOU7mI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuan Chen , Linus Walleij , Sasha Levin Subject: [PATCH 6.15 244/480] pinctrl: berlin: fix memory leak in berlin_pinctrl_build_state() Date: Tue, 12 Aug 2025 19:47:32 +0200 Message-ID: <20250812174407.524158891@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 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.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuan Chen [ Upstream commit 8f6f303551100291bf2c1e1ccc66b758fffb1168 ] In the original implementation, krealloc() failure handling incorrectly assigned the original memory pointer to NULL after kfree(), causing a memory leak when reallocation failed. Fixes: de845036f997 ("pinctrl: berlin: fix error return code of berlin_pinctrl_build_state()") Signed-off-by: Yuan Chen Link: https://lore.kernel.org/20250620015343.21494-1-chenyuan_fl@163.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/berlin/berlin.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c index c372a2a24be4..9dc2da8056b7 100644 --- a/drivers/pinctrl/berlin/berlin.c +++ b/drivers/pinctrl/berlin/berlin.c @@ -204,6 +204,7 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) const struct berlin_desc_group *desc_group; const struct berlin_desc_function *desc_function; int i, max_functions = 0; + struct pinfunction *new_functions; pctrl->nfunctions = 0; @@ -229,12 +230,15 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) } } - pctrl->functions = krealloc(pctrl->functions, + new_functions = krealloc(pctrl->functions, pctrl->nfunctions * sizeof(*pctrl->functions), GFP_KERNEL); - if (!pctrl->functions) + if (!new_functions) { + kfree(pctrl->functions); return -ENOMEM; + } + pctrl->functions = new_functions; /* map functions to theirs groups */ for (i = 0; i < pctrl->desc->ngroups; i++) { desc_group = pctrl->desc->groups + i; -- 2.39.5