Skip to content

Commit 4f260a0

Browse files
amboarSherryYang1
authored andcommitted
soc: aspeed: lpc-snoop: Don't disable channels that aren't enabled
commit 56448e7 upstream. Mitigate e.g. the following: # echo 1e789080.lpc-snoop > /sys/bus/platform/drivers/aspeed-lpc-snoop/unbind ... [ 120.363594] Unable to handle kernel NULL pointer dereference at virtual address 00000004 when write [ 120.373866] [00000004] *pgd=00000000 [ 120.377910] Internal error: Oops: 805 [#1] SMP ARM [ 120.383306] CPU: 1 UID: 0 PID: 315 Comm: sh Not tainted 6.15.0-rc1-00009-g926217bc7d7d-dirty #20 NONE ... [ 120.679543] Call trace: [ 120.679559] misc_deregister from aspeed_lpc_snoop_remove+0x84/0xac [ 120.692462] aspeed_lpc_snoop_remove from platform_remove+0x28/0x38 [ 120.700996] platform_remove from device_release_driver_internal+0x188/0x200 ... Fixes: 9f4f9ae ("drivers/misc: add Aspeed LPC snoop driver") Cc: stable@vger.kernel.org Cc: Jean Delvare <jdelvare@suse.de> Acked-by: Jean Delvare <jdelvare@suse.de> Link: https://patch.msgid.link/20250616-aspeed-lpc-snoop-fixes-v2-2-3cdd59c934d3@codeconstruct.com.au Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 62e51f51d97477ea4e78c82e7076a171dac86c75) Signed-off-by: Sherry Yang <sherry.yang@oracle.com>
1 parent 1eda431 commit 4f260a0

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

drivers/soc/aspeed/aspeed-lpc-snoop.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ struct aspeed_lpc_snoop_model_data {
6060
};
6161

6262
struct aspeed_lpc_snoop_channel {
63+
bool enabled;
6364
struct kfifo fifo;
6465
wait_queue_head_t wq;
6566
struct miscdevice miscdev;
@@ -192,6 +193,9 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
192193
const struct aspeed_lpc_snoop_model_data *model_data =
193194
of_device_get_match_data(dev);
194195

196+
if (WARN_ON(lpc_snoop->chan[channel].enabled))
197+
return -EBUSY;
198+
195199
init_waitqueue_head(&lpc_snoop->chan[channel].wq);
196200
/* Create FIFO datastructure */
197201
rc = kfifo_alloc(&lpc_snoop->chan[channel].fifo,
@@ -238,6 +242,8 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
238242
regmap_update_bits(lpc_snoop->regmap, HICRB,
239243
hicrb_en, hicrb_en);
240244

245+
lpc_snoop->chan[channel].enabled = true;
246+
241247
return 0;
242248

243249
err_misc_deregister:
@@ -250,6 +256,9 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
250256
static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
251257
int channel)
252258
{
259+
if (!lpc_snoop->chan[channel].enabled)
260+
return;
261+
253262
switch (channel) {
254263
case 0:
255264
regmap_update_bits(lpc_snoop->regmap, HICR5,
@@ -265,6 +274,8 @@ static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
265274
return;
266275
}
267276

277+
lpc_snoop->chan[channel].enabled = false;
278+
/* Consider improving safety wrt concurrent reader(s) */
268279
misc_deregister(&lpc_snoop->chan[channel].miscdev);
269280
kfifo_free(&lpc_snoop->chan[channel].fifo);
270281
}

0 commit comments

Comments
 (0)