From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794364723; b=NRV5/DHD4MCoSF8PkMblL0+eoAlT9f9SYEUTrB1pZLWtTJpC7Mek0KnGegf9pgsZ/J8O QyOEvYOgM02GYg0ean0PqQYtuYojp5BX5ZiEcRAexne6+58cKGxLBKcYaNimCHX9bgz3B lR3jrr1+zD7xcqZsHFfPeLf9bLj+4jMzaWeNKGCvPaRFxPtB8XABIrKsf6nSKbKGXVAJ+ sQGahyOc4qzfsOLBy+3vrbhVtSnidqjeQuf5YzBC3xtXqc/559VfCXR9BhM7wlMUm+Iuc ZuJ7+pseErEAFd7UQQNinhrlvldcu7uLvxHxJPftbAtO7skL93J1xMN3HC+o4FzgFfA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794364723; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=/hkgofJzeFivChO4+ybtVyOIYAo7m1TNgeF1LeZlxYg=; b=N9+wGSHEGljfTuuKDszDQRNyHcK1nrTYQw9Hq2expLYb3cyVeWIkmUnUY67H5A1h5Rmq LWEPxWvXrXyLWpa4NhYCgG2kuiTsdNFrq1HvI2vbMWuiTdCxlU2Ca0uwrmvqJ0buqXEIA HU89gRoFWK5HZ/S9ISVSsY7E54P/DqrutWUCQca+fVeUm6/sHOG/hywSGmnDIHw1w+6xp MX3Ib2xEVqliNr12lzIhjS/rtSaAzaty3Np6s6BNLKA+d5snGEAvkhUzvEczGl2BSMRqB BPScJuEvsF970HijQ8glUlYzqVCqv/7aodcMODJEvFQTRNoCIOqR5enkIMSSTDvIf9g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=MmEVtexq; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1863606A31C for ; Wed, 11 Nov 2026 02:38:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=MmEVtexq Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8E181F0089F; Wed, 11 Nov 2026 02:38:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794364723; bh=/hkgofJzeFivChO4+ybtVyOIYAo7m1TNgeF1LeZlxYg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MmEVtexqp7CDKs2qs03xn0OMCE6EDcGSxYt2PikZ1EPeDsRjGsAD7ewZjWWtrmaNp Wue0TXGziNYJB3cDRO8YRaDyswI9peqfAc2tTvKeqcntL02kFyj7YwyhH7z36MN/HA PUeTyAUfvFACtGWE7SPhWy2aIjluCGRcH/YYBsi/6r/gVjaMh4ghmKi3hfnJ4DJJht u7zwXODfw770qxNoYj7Jn4bY2TAEvsIaP5dl2W+pk4NAkQ6r58S48gbMmBQff9rwaq tEweE1cHPQAYfbBh/tp2jhhK96ehtOO886Iu4ULHzjtzSY6wZUnDxdUQjCOs5Ro33B TuoZNZeczXtBg== From: Sasha Levin To: stable@vger.kernel.org Cc: Fan Wu , Song Li , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.6.y] power: supply: bq27xxx: Ensure poll work is cancelled on remove Date: Tue, 10 Nov 2026 21:38:41 -0500 Message-ID: <20261111023748.708999-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261107052900-failed-6.6-db560f4b1c52@kernel.org> References: <20261107052900-failed-6.6-db560f4b1c52@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Fan Wu [ Upstream commit db560f4b1c5253853f978385db066220e0c218dc ] The di->work poll work is queued from the poll callback itself and from bq27xxx_external_power_changed(). The cancel_delayed_work_sync() in bq27xxx_battery_teardown() runs while the power_supply is still registered, so external_power_changed() can re-arm the work after the cancel, and it runs after the driver data has been freed. Register a devm_delayed_work_autocancel() before devm_power_supply_register(), so on unwind the power_supply is unregistered first, after which no new external_power_changed() callback can be dispatched, and the poll work is cancelled only then. Drop the now-redundant cancel from bq27xxx_battery_teardown(). This issue was found by an in-house static analysis tool. Fixes: 740b755a3b34 ("bq27x00: Poll battery state") Cc: stable@vger.kernel.org Assisted-by: Codex:gpt-5.6 Co-developed-by: Song Li Signed-off-by: Song Li Signed-off-by: Fan Wu Link: https://patch.msgid.link/20260903081312.225535-1-fanwu01@zju.edu.cn Signed-off-by: Sebastian Reichel [ sashal: Retained power_supply_register_no_ws() with explicit unregistration instead of managed power-supply registration. ] Signed-off-by: Sasha Levin --- drivers/power/supply/bq27xxx_battery.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c index 77c80901910c3..79c7cbc858a72 100644 --- a/drivers/power/supply/bq27xxx_battery.c +++ b/drivers/power/supply/bq27xxx_battery.c @@ -43,6 +43,7 @@ */ #include +#include #include #include #include @@ -2141,9 +2142,11 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di) .of_node = di->dev->of_node, .drv_data = di, }; + int ret; - INIT_DELAYED_WORK(&di->work, bq27xxx_battery_poll); - mutex_init(&di->lock); + ret = devm_mutex_init(di->dev, &di->lock); + if (ret) + return ret; di->regs = bq27xxx_chip_data[di->chip].regs; di->unseal_key = bq27xxx_chip_data[di->chip].unseal_key; @@ -2161,6 +2164,12 @@ int bq27xxx_battery_setup(struct bq27xxx_device_info *di) psy_desc->get_property = bq27xxx_battery_get_property; psy_desc->external_power_changed = bq27xxx_external_power_changed; + /* Cancel the poll work after the power_supply is unregistered. */ + ret = devm_delayed_work_autocancel(di->dev, &di->work, + bq27xxx_battery_poll); + if (ret) + return ret; + di->bat = power_supply_register_no_ws(di->dev, psy_desc, &psy_cfg); if (IS_ERR(di->bat)) return dev_err_probe(di->dev, PTR_ERR(di->bat), @@ -2188,10 +2197,7 @@ void bq27xxx_battery_teardown(struct bq27xxx_device_info *di) di->removed = true; mutex_unlock(&di->lock); - cancel_delayed_work_sync(&di->work); - power_supply_unregister(di->bat); - mutex_destroy(&di->lock); } EXPORT_SYMBOL_GPL(bq27xxx_battery_teardown); -- 2.53.0