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 11C5B12F590; Tue, 14 May 2024 11:39:14 +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=1715686755; cv=none; b=AacWWcOtKPXBLSE+uAG2PRONu30F7P78WyPfCj07NhtWlcXWXHFaI80QptjMyO6a6sqwB+qMT6fPdk0M7Uaz6oKunSEunSA4m8/Dea4T5AQTb70NyTOUbjqrCeqGftfox1fkOKjZ07sAcAsfP/SrwsZgu/UxJp6c7Mc/F/pHt3A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715686755; c=relaxed/simple; bh=9se9Y0e03JSnuQwQcaPxA46R7BW4Vui1C58kMzMiSTk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GfSkPJoaKMxJud+EaQ1nBs2yAETovJ3HGsg8hues4OymavjCK10bm7wsEhXA6jNDHxmXnRiJUoC75vBp1+FLgPJk2TRonmFYc9Z0flgO4STa06KfXPGyUOktmA9YHp1/0OqVPxT0vj3i8SDGHp2N7ZvEIoWmidoDbREi8jnUdc0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=r5nhCujv; 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="r5nhCujv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3AB76C2BD10; Tue, 14 May 2024 11:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715686754; bh=9se9Y0e03JSnuQwQcaPxA46R7BW4Vui1C58kMzMiSTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r5nhCujvzEvuoU2CDzCrXQc1cEXVHTY5Ze8Zhooqgye6mwta8N1M5DzqoHBGJDia6 GkscUIbp2T/4d8n5rUuPppHeciv5KJeq/ZCN9UYl4+DTaisA7PfTUFfa1gyXPlbCzy rPKNPUvdPuuRKxBiRo/ySOa9J1Ze51Bbm9n9TWoo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Zeng Heng , Linus Walleij , Sasha Levin Subject: [PATCH 4.19 11/63] pinctrl: devicetree: fix refcount leak in pinctrl_dt_to_map() Date: Tue, 14 May 2024 12:19:32 +0200 Message-ID: <20240514100948.441162535@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514100948.010148088@linuxfoundation.org> References: <20240514100948.010148088@linuxfoundation.org> User-Agent: quilt/0.67 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 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zeng Heng [ Upstream commit a0cedbcc8852d6c77b00634b81e41f17f29d9404 ] If we fail to allocate propname buffer, we need to drop the reference count we just took. Because the pinctrl_dt_free_maps() includes the droping operation, here we call it directly. Fixes: 91d5c5060ee2 ("pinctrl: devicetree: fix null pointer dereferencing in pinctrl_dt_to_map") Suggested-by: Dan Carpenter Signed-off-by: Zeng Heng Reviewed-by: Dan Carpenter Message-ID: <20240415105328.3651441-1-zengheng4@huawei.com> Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/devicetree.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c index 6f5acfcba57ce..01cc09e2bccbe 100644 --- a/drivers/pinctrl/devicetree.c +++ b/drivers/pinctrl/devicetree.c @@ -235,14 +235,16 @@ int pinctrl_dt_to_map(struct pinctrl *p, struct pinctrl_dev *pctldev) for (state = 0; ; state++) { /* Retrieve the pinctrl-* property */ propname = kasprintf(GFP_KERNEL, "pinctrl-%d", state); - if (!propname) - return -ENOMEM; + if (!propname) { + ret = -ENOMEM; + goto err; + } prop = of_find_property(np, propname, &size); kfree(propname); if (!prop) { if (state == 0) { - of_node_put(np); - return -ENODEV; + ret = -ENODEV; + goto err; } break; } -- 2.43.0