Skip to content

Commit

Permalink
sh: intc: Fix use-after-free bug in register_intc_controller()
Browse files Browse the repository at this point in the history
[ Upstream commit 63e72e551942642c48456a4134975136cdcb9b3c ]

In the error handling for this function, d is freed without ever
removing it from intc_list which would lead to a use after free.
To fix this, let's only add it to the list after everything has
succeeded.

Fixes: 2dcec7a ("sh: intc: set_irq_wake() support")
Signed-off-by: Dan Carpenter <[email protected]>
Reviewed-by: John Paul Adrian Glaubitz <[email protected]>
Signed-off-by: John Paul Adrian Glaubitz <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
Dan Carpenter authored and gregkh committed Dec 5, 2024
1 parent 94a6159 commit 3c7c806
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/sh/intc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,6 @@ int __init register_intc_controller(struct intc_desc *desc)
goto err0;

INIT_LIST_HEAD(&d->list);
list_add_tail(&d->list, &intc_list);

raw_spin_lock_init(&d->lock);
INIT_RADIX_TREE(&d->tree, GFP_ATOMIC);
Expand Down Expand Up @@ -380,6 +379,7 @@ int __init register_intc_controller(struct intc_desc *desc)

d->skip_suspend = desc->skip_syscore_suspend;

list_add_tail(&d->list, &intc_list);
nr_intc_controllers++;

return 0;
Expand Down

0 comments on commit 3c7c806

Please sign in to comment.