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 6087835E4EC; Tue, 26 Aug 2025 14:32:11 +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=1756218731; cv=none; b=nP/nCYLQx67rbZyxtNEz00eWYIyxNZ2jTwUsVcmWaFAbZgfOVWiZNxsfs0La4zm/+9slVQQ0oIgi6U6nRZmy1KLmbx7fxF//TgmJuNTo54MaTji8u2R8BQJqXpGzrOuIJcDvIi0VGyUOrY8SQCNC3suBv4+VmUtoI/JrgcORhNw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756218731; c=relaxed/simple; bh=rWo3uozOukjiDTGfF1mQEu5Yu3rhDX7wopu3HjPbEBs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AdtYqjveUW+GBH2l/qLtilOpQKp9XRP03KYyyFSG3e/saY7gTm8uxvUdzWyAjvqsOER5qvrX3lTNN8gjyevveFzikUqe38KkFpK9moQfnHy3+LZ+6XEDueNycqJWsfRPt8d2+zXt8IuG9iUq+ffGs5ZQokM6XVzk0flimGaqWbQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ObbeAMdZ; 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="ObbeAMdZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3F4FC4CEF1; Tue, 26 Aug 2025 14:32:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756218731; bh=rWo3uozOukjiDTGfF1mQEu5Yu3rhDX7wopu3HjPbEBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ObbeAMdZpBfrYbjGC4g7bywpAU6a5eQh5UMdUHpo3d1HmnOqNd0DvaUyGJL5n9QY7 RlB21lemF+hfiWDKMVwO6WdknWrvT5Bz8vtZkXBT9t9flu1soKhwMW8WG22uqeiz9p tdPZHQNbLSH5hdumXOx2GecDzB2WhvmTwGdG3EXU= 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 5.4 110/403] pinctrl: sunxi: Fix memory leak on krealloc failure Date: Tue, 26 Aug 2025 13:07:16 +0200 Message-ID: <20250826110909.725497750@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110905.607690791@linuxfoundation.org> References: <20250826110905.607690791@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 5.4-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 8c41f8b818b2..83775dd12cfa 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c @@ -327,6 +327,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; @@ -401,9 +402,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