Skip to content

Commit 42ae85b

Browse files
amboarvijay-suman
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 166afe964e8433d52c641f5d1c09102bacee9a92) Signed-off-by: Vijayendra Suman <vijayendra.suman@oracle.com>
1 parent 003d5d9 commit 42ae85b

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
@@ -59,6 +59,7 @@ struct aspeed_lpc_snoop_model_data {
5959
};
6060

6161
struct aspeed_lpc_snoop_channel {
62+
bool enabled;
6263
struct kfifo fifo;
6364
wait_queue_head_t wq;
6465
struct miscdevice miscdev;
@@ -191,6 +192,9 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
191192
const struct aspeed_lpc_snoop_model_data *model_data =
192193
of_device_get_match_data(dev);
193194

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

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

242248
err_misc_deregister:
@@ -249,6 +255,9 @@ static int aspeed_lpc_enable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
249255
static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
250256
int channel)
251257
{
258+
if (!lpc_snoop->chan[channel].enabled)
259+
return;
260+
252261
switch (channel) {
253262
case 0:
254263
regmap_update_bits(lpc_snoop->regmap, HICR5,
@@ -264,6 +273,8 @@ static void aspeed_lpc_disable_snoop(struct aspeed_lpc_snoop *lpc_snoop,
264273
return;
265274
}
266275

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

0 commit comments

Comments
 (0)