diff mbox series

RAS/AMD/FMPM: Avoid NULL ptr deref in get_saved_records()

Message ID 20240312154937.1102727-1-yazen.ghannam@amd.com (mailing list archive)
State New
Headers show
Series RAS/AMD/FMPM: Avoid NULL ptr deref in get_saved_records() | expand

Commit Message

Yazen Ghannam March 12, 2024, 3:49 p.m. UTC 
An old, invalid record should be cleared and skipped.

Currently, the record is cleared in ERST, but it is not skipped. This
leads to a NULL pointer dereference when attempting to copy the old
record to the new record.

Continue the loop after clearing an old, invalid record to skip it.

Fixes: 6f15e617cc99 ("RAS: Introduce a FRU memory poison manager")
Signed-off-by: Yazen Ghannam <yazen.ghannam@amd.com>
---
 drivers/ras/amd/fmpm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


base-commit: 855684c7d938c2442f07eabc154e7532b4c1fbf9
diff mbox series

Patch

diff --git a/drivers/ras/amd/fmpm.c b/drivers/ras/amd/fmpm.c
index 2f4ac9591c8f..9d25195b4538 100644
--- a/drivers/ras/amd/fmpm.c
+++ b/drivers/ras/amd/fmpm.c
@@ -676,8 +676,10 @@  static int get_saved_records(void)
 		}
 
 		new = get_valid_record(old);
-		if (!new)
+		if (!new) {
 			erst_clear(record_id);
+			continue;
+		}
 
 		/* Restore the record */
 		memcpy(new, old, len);