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 1F4542F83A1; Tue, 12 Aug 2025 18:14:47 +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=1755022487; cv=none; b=rKIWbLmPDKf3G+tiDdu8HgT54JgtHCQnh1Enjc17KV6jKxkwxZLjvavL36Lcct0z5mGKTzcHQ7vBUGtAClO56lV2OPdzG0nHJwjRxxSrcLTlcfB6i11IvX9IX0UYxHYv4fcqgUdMekPVgn4miyYvukuPUT/F/oLJX2dEtAWO5mc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755022487; c=relaxed/simple; bh=+3O9hbRdMVzSrZzsiQA32qZgYTshSB6Mw8b3tWh4fbo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=moysERZjQ0HYfJlLR+0I62Gf3dbdhEF+p/UPZg6wJ5i9qlT+ne3ka4KcmUVyNIm2xw8SZHq8JOn9znMOGX19rZbQq/gMN0p+5aOF0HPUqCxIPeoeGlzfKZuRg3dkWxg78+/TcWFXnSwTtwWnfa7JPvqwsczcpciDc3i5Ljj9BLk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DJjTQPNH; 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="DJjTQPNH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 783CBC4CEF0; Tue, 12 Aug 2025 18:14:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755022487; bh=+3O9hbRdMVzSrZzsiQA32qZgYTshSB6Mw8b3tWh4fbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJjTQPNHimwlo8iBIa768faEBCZTMDroos7TGa1iey8msc+qjiC7Dbo0owUBrD6AO jHS5SXofTSFCCyB1u/1FJFhVV+8GONdABvmO2IAcQDy9ICs/CpNNDWntugKcYUlzAX SKI0gMBFJ/LJL/tHhuIzr6nV670KOIdJgpmdxm3U= 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.12 168/369] pinctrl: sunxi: Fix memory leak on krealloc failure Date: Tue, 12 Aug 2025 19:27:45 +0200 Message-ID: <20250812173021.088500797@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812173014.736537091@linuxfoundation.org> References: <20250812173014.736537091@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Yuan Chen [ Upstream commit e3507c56cbb208d4f160942748c527ef6a528ba1 ] In sunxi_pctrl_dt_node_to_map(), when krealloc() fails to resize the pinctrl_map array, the function returns -ENOMEM directly without freeing the previously allocated *map buffer. This results in a memory leak of the original kmalloc_array allocation. Fixes: e11dee2e98f8 ("pinctrl: sunxi: Deal with configless pins") Signed-off-by: Yuan Chen Link: https://lore.kernel.org/20250620012708.16709-1-chenyuan_fl@163.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/sunxi/pinctrl-sunxi.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index bde67ee31417..8fbbdcc52deb 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -395,6 +395,7 @@ static int sunxi_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, const char *function, *pin_prop; const char *group; int ret, npins, nmaps, configlen = 0, i = 0; + struct pinctrl_map *new_map; *map = NULL; *num_maps = 0; @@ -469,9 +470,13 @@ static int sunxi_pctrl_dt_node_to_map(struct pinctrl_dev *pctldev, * We know have the number of maps we need, we can resize our * map array */ - *map = krealloc(*map, i * sizeof(struct pinctrl_map), GFP_KERNEL); - if (!*map) - return -ENOMEM; + new_map = krealloc(*map, i * sizeof(struct pinctrl_map), GFP_KERNEL); + if (!new_map) { + ret = -ENOMEM; + goto err_free_map; + } + + *map = new_map; return 0; -- 2.39.5