From 12abcfde1ad3ee9bed726d25fdd4eeb31026b187 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Mon, 29 Apr 2013 20:06:37 +0100 Subject: efi, pstore: Remove entry from list when erasing We need to remove the entry from the EFI variable list before we erase it from the variable store and free the associated state, otherwise it's possible to hit the following crash, BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] __efivar_entry_iter+0xcf/0x120 PGD 19483f067 PUD 195426067 PMD 0 Oops: 0000 [#1] SMP [...] Call Trace: [] efi_pstore_erase+0xef/0x140 [] ? math_error+0x288/0x2d0 [] pstore_unlink+0x41/0x60 [] vfs_unlink+0x9f/0x110 [] do_unlinkat+0x18b/0x280 [] ? sys_newfstatat+0x36/0x50 [] sys_unlinkat+0x22/0x40 [] system_call_fastpath+0x16/0x1b Reported-by: Seiji Aguchi Tested-by: Seiji Aguchi Cc: Tony Luck Cc: Matthew Garrett Signed-off-by: Matt Fleming --- drivers/firmware/efi/efi-pstore.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/firmware') diff --git a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c index 583ee8037f4..af45c42086e 100644 --- a/drivers/firmware/efi/efi-pstore.c +++ b/drivers/firmware/efi/efi-pstore.c @@ -167,6 +167,8 @@ static int efi_pstore_erase_func(struct efivar_entry *entry, void *data) /* found */ __efivar_entry_delete(entry); + list_del(&entry->list); + return 1; } -- cgit v1.2.3-70-g09d2