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 90AE93242BD; Fri, 4 Sep 2026 05:55:36 +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=1788501337; cv=none; b=lqyQt15oZP7XAO8lxU9glyGChVi/9fytYyVmcOXhpY3d1p9sYKnAtDRg+HKIru966uUr9WhZj2C9QsX3lfo+ufd5VxPRUYJXOKtS9Xd05LDsjvNSi5QD0esRjVWywl1jtYy34OhV1el0kOA9XK42LnXjQHBxiErTkRpq6bC8K4U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788501337; c=relaxed/simple; bh=vyIHwju8xJRbRyN/iDHpb75wuz+EQyXZo5AydcqRBL0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KDdkBNSe7DqmUy+SytuDDGEuerPc64c2Vah4Ftbfq0ugQw6bv69R2e1CTQK51SuIvYJ7y4YPw/JWNhnP/dneIqi0JJ0c+PSBz1wip6QjcyVTO35N2anS8MNCxtIiRrH0oobql0SctT6JLcNzMkpE3um3ibJjlft9lDo+xpj39G8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tOeoB5Xo; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tOeoB5Xo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2AE81F00A3D; Fri, 4 Sep 2026 05:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788501336; bh=tjFqi/26L7lWhEQbQUSvfMaNFvghYQhTNFb8DQqvC0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tOeoB5Xoa8OBoSSB/y5PMarZbbJmvvIeeYu2i5UvYXSkCPRkw7vOTp7iPkS6bED8Q 36frz1Io+qXkHW9SfYJ5840J8XvMQMupOo4wjmmczpCwbf/XP9y9EMNuLBPzr6aAGP rJBRe2GDR2bh/AOsHcm3ed7AQZ3YrFpT93F/PdLQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fan Wu , Sebastian Reichel Subject: [PATCH 6.18 374/552] power: supply: qcom_battmgr: fix use-after-free Date: Fri, 4 Sep 2026 06:58:51 +0200 Message-ID: <20260904045758.702347185@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@linuxfoundation.org> User-Agent: quilt/0.69 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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fan Wu commit 4e40befedfc8ed86f44e1f81df92d13c149c9f8d upstream. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/power/supply/qcom_battmgr.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/power/supply/qcom_battmgr.c +++ b/drivers/power/supply/qcom_battmgr.c @@ -5,6 +5,7 @@ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. */ #include +#include #include #include #include @@ -1650,7 +1651,6 @@ static int qcom_battmgr_probe(struct aux 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); @@ -1713,6 +1713,11 @@ static int qcom_battmgr_probe(struct aux "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,