Skip to content

Commit a312549

Browse files
aeglIngo Molnar
authored andcommitted
x86/mce: Avoid using object after free in genpool
When we loop over all queued machine check error records to pass them to the registered notifiers we use llist_for_each_entry(). But the loop calls gen_pool_free() for the entry in the body of the loop - and then the iterator looks at node->next after the free. Use llist_for_each_entry_safe() instead. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: <stable@vger.kernel.org> Cc: Gong Chen <gong.chen@linux.intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-edac <linux-edac@vger.kernel.org> Link: http://lkml.kernel.org/r/0205920@agluck-desk.sc.intel.com Link: http://lkml.kernel.org/r/1459929916-12852-4-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent f87e043 commit a312549

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kernel/cpu/mcheck/mce-genpool.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ static char gen_pool_buf[MCE_POOLSZ];
2929
void mce_gen_pool_process(void)
3030
{
3131
struct llist_node *head;
32-
struct mce_evt_llist *node;
32+
struct mce_evt_llist *node, *tmp;
3333
struct mce *mce;
3434

3535
head = llist_del_all(&mce_event_llist);
3636
if (!head)
3737
return;
3838

3939
head = llist_reverse_order(head);
40-
llist_for_each_entry(node, head, llnode) {
40+
llist_for_each_entry_safe(node, tmp, head, llnode) {
4141
mce = &node->mce;
4242
atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, mce);
4343
gen_pool_free(mce_evt_pool, (unsigned long)node, sizeof(*node));

0 commit comments

Comments
 (0)