From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 3BBE8562616 for ; Wed, 9 Sep 2026 16:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788972761; cv=none; b=LbbAvBYLdlnthgjhsB8YMJ3MeRtf4rzkLC05ctY2neRDQxu47FgGI0TiyI6Jam+yqyXChr3bqCZGIyDqvLONe9Lr0AqyczQ5bCo2q/yNFHe0oW16Y0p4X3k+LCqPFt/YrPFZUxf7oX9kLFbxzrAM00BUFbXzFBwTPxI3PdmX3wo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788972761; c=relaxed/simple; bh=zIcgemZxrtnB95t3L26e0bFujrcoI1wbHejED1jmjqo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZAJFOEdHDtf+tmGWgGJsTSpX/ibnymeogEFy4mvWp355UcES/3cvzyYBOsbPxr7DsZ8kLwfjFPWz78bLlE76ctFM7SYCedXFRh0BgvALTnK7+rT8CR0nifQobCuPs8c/UBmhEBO522ac/qxmh8AJ+nSHG6MfvixyL7mRtFee/Jc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=otoYIhpR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="otoYIhpR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 692CF1F000FF; Wed, 9 Sep 2026 16:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788972760; bh=9cGH4tIJX0TAY4Sxqgsz5vvamfmIKRPaDGVjdysgbTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=otoYIhpRjYthc7vyOEDozH9byyjgoG1JR/55eL+8yPkN1AdvDl2deegcrLpb1tfj9 3JlkqVM9LTa9p2EaYfVSbKzEJj73ywHSyFcWYiSaF19Plaq1tiNgb04BewsB+PBsB+ hHgTBJIvWdxgyQyzuKhq00cgA+VfAQP1N/TjtTfZCfHBI6ZlZZcdTE0ljZFdw4e0nz 1N9A7FyT6qqWHFzge2zrj39zmfUHlieiNTz9tAUKvVE6ceJZdrQ7Veawbo4ph+xkpI QMS9/BnJN5qUcepqlAtf82z8KD9sERoKmBiwF4BmTd9Wtk4qDYWGKc0HakA6wSSYka 8+XoKZ0gF2IBw== From: Sasha Levin To: stable@vger.kernel.org Cc: Fan Wu , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.6.y] power: supply: qcom_battmgr: fix use-after-free Date: Wed, 9 Sep 2026 12:52:35 -0400 Message-ID: <20260909165235.3126480-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090355-pretty-cube-4fda@gregkh> References: <2026090355-pretty-cube-4fda@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Fan Wu [ Upstream commit 4e40befedfc8ed86f44e1f81df92d13c149c9f8d ] qcom_battmgr_pdr_notify() queues enable_work when the PMIC GLINK service comes up, and the worker recovers battmgr through container_of() to issue firmware requests. The PMIC GLINK client stays on the client list until its devres release action runs, so a PDR notification can keep queueing the work, and a pending or running worker can access battmgr after devres frees it. Make enable_work device-managed with devm_work_autocancel(), registered before the PMIC GLINK client is allocated. The devres cleanup then releases the client first, so no further notification can queue the work, and cancels the work before battmgr is freed. This issue was found by an in-house static analysis tool. Fixes: 29e8142b5623 ("power: supply: Introduce Qualcomm PMIC GLINK power supply") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5.6 Signed-off-by: Fan Wu Link: https://patch.msgid.link/20260731022006.317192-1-fanwu01@zju.edu.cn Link: https://patch.msgid.link/20260801051923.354496-1-fanwu01@zju.edu.cn Signed-off-by: Sebastian Reichel [ added the missing int ret declaration in qcom_battmgr_probe() ] Signed-off-by: Sasha Levin --- drivers/power/supply/qcom_battmgr.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/power/supply/qcom_battmgr.c b/drivers/power/supply/qcom_battmgr.c index e5eade1328163..326cddfb8e347 100644 --- a/drivers/power/supply/qcom_battmgr.c +++ b/drivers/power/supply/qcom_battmgr.c @@ -4,6 +4,7 @@ * Copyright (c) 2022, Linaro Ltd */ #include +#include #include #include #include @@ -1329,6 +1330,7 @@ static int qcom_battmgr_probe(struct auxiliary_device *adev, const struct of_device_id *match; struct qcom_battmgr *battmgr; struct device *dev = &adev->dev; + int ret; battmgr = devm_kzalloc(dev, sizeof(*battmgr), GFP_KERNEL); if (!battmgr) @@ -1344,7 +1346,6 @@ static int qcom_battmgr_probe(struct auxiliary_device *adev, psy_cfg_supply.supplied_to = qcom_battmgr_battery; psy_cfg_supply.num_supplicants = 1; - INIT_WORK(&battmgr->enable_work, qcom_battmgr_enable_worker); mutex_init(&battmgr->lock); init_completion(&battmgr->ack); @@ -1391,6 +1392,11 @@ static int qcom_battmgr_probe(struct auxiliary_device *adev, "failed to register wireless charing power supply\n"); } + ret = devm_work_autocancel(dev, &battmgr->enable_work, + qcom_battmgr_enable_worker); + if (ret) + return ret; + battmgr->client = devm_pmic_glink_client_alloc(dev, PMIC_GLINK_OWNER_BATTMGR, qcom_battmgr_callback, qcom_battmgr_pdr_notify, -- 2.53.0