42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From d439975850f947ced01423dc4bb4d6406022b4e1 Mon Sep 17 00:00:00 2001
|
|
From: hubin <hubin73@huawei.com>
|
|
Date: Thu, 18 May 2023 16:14:41 +0800
|
|
Subject: [PATCH] ras-events: quit loop in read_ras_event when kbuf data is
|
|
broken
|
|
|
|
when kbuf data is broken, kbuffer_next_event() may move kbuf->index back to
|
|
the current kbuf->index position, causing dead loop.
|
|
|
|
In this situation, rasdaemon will repeatedly parse an invalid event, and
|
|
print warning like "ug! negative record size -8!", pushing cpu utilization
|
|
rate to 100%.
|
|
|
|
when kbuf data is broken, discard current page and continue reading next page
|
|
kbuf.
|
|
|
|
Signed-off-by: hubin <hubin73@huawei.com>
|
|
---
|
|
ras-events.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/ras-events.c b/ras-events.c
|
|
index 1479732..11ecb4d 100644
|
|
--- a/ras-events.c
|
|
+++ b/ras-events.c
|
|
@@ -498,6 +498,11 @@ static int read_ras_event_all_cpus(struct pthread_data *pdata,
|
|
kbuffer_load_subbuffer(kbuf, page);
|
|
|
|
while ((data = kbuffer_read_event(kbuf, &time_stamp))) {
|
|
+ if (kbuffer_curr_size(kbuf) < 0) {
|
|
+ log(TERM, LOG_ERR, "invalid kbuf data, discard\n");
|
|
+ break;
|
|
+ }
|
|
+
|
|
parse_ras_data(&pdata[i],
|
|
kbuf, data, time_stamp);
|
|
|
|
--
|
|
2.33.0
|
|
|
|
|