diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-30 19:47:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-30 19:47:23 +0200 |
| commit | 42df60fcdfb8c02fa1800899cb33858e46efd587 (patch) | |
| tree | dc67b5f721356a9852ed297172701111b053359b /drivers | |
| parent | Merge tag 'dma-mapping-5.9-2' of git://git.infradead.org/users/hch/dma-mapping (diff) | |
| parent | EDAC/ghes: Fix NULL pointer dereference in ghes_edac_register() (diff) | |
| download | linux-42df60fcdfb8c02fa1800899cb33858e46efd587.tar.xz linux-42df60fcdfb8c02fa1800899cb33858e46efd587.zip | |
Merge tag 'edac_urgent_for_v5.9_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras
Pull EDAC fix from Borislav Petkov:
"A fix to properly clear ghes_edac driver state on driver remove so
that a subsequent load can probe the system properly (Shiju Jose)"
* tag 'edac_urgent_for_v5.9_rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
EDAC/ghes: Fix NULL pointer dereference in ghes_edac_register()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/edac/ghes_edac.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/edac/ghes_edac.c b/drivers/edac/ghes_edac.c index da60c29468a7..54ebc8afc6b1 100644 --- a/drivers/edac/ghes_edac.c +++ b/drivers/edac/ghes_edac.c @@ -55,6 +55,8 @@ static DEFINE_SPINLOCK(ghes_lock); static bool __read_mostly force_load; module_param(force_load, bool, 0); +static bool system_scanned; + /* Memory Device - Type 17 of SMBIOS spec */ struct memdev_dmi_entry { u8 type; @@ -225,14 +227,12 @@ static void enumerate_dimms(const struct dmi_header *dh, void *arg) static void ghes_scan_system(void) { - static bool scanned; - - if (scanned) + if (system_scanned) return; dmi_walk(enumerate_dimms, &ghes_hw); - scanned = true; + system_scanned = true; } void ghes_edac_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) @@ -631,6 +631,8 @@ void ghes_edac_unregister(struct ghes *ghes) mutex_lock(&ghes_reg_mutex); + system_scanned = false; + if (!refcount_dec_and_test(&ghes_refcount)) goto unlock; |