From c121d0eea3bf462b2d0a2d73882442149f6a9fa1 Mon Sep 17 00:00:00 2001 From: shenchenkai Date: Fri, 22 Oct 2021 16:59:53 +0800 Subject: [PATCH] Description:[fix] clean hilog/hievent ring buffer after memory verification failed Change-Id: I9310fe807ec95721be78deb60ed9728ef9b56e48 Signed-off-by: shenchenkai --- kernel/extended/hilog/los_hilog.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/extended/hilog/los_hilog.c b/kernel/extended/hilog/los_hilog.c index 210addca..2c8853be 100644 --- a/kernel/extended/hilog/los_hilog.c +++ b/kernel/extended/hilog/los_hilog.c @@ -201,6 +201,13 @@ static ssize_t HiLogRead(struct file *filep, char *buffer, size_t bufLen) HiLogBufferDec(header.len); retval = header.len + sizeof(header); out: + if (retval == -ENOMEM) { + // clean ring buffer + g_hiLogDev.writeOffset = 0; + g_hiLogDev.headOffset = 0; + g_hiLogDev.size = 0; + g_hiLogDev.count = 0; + } (VOID)LOS_MuxRelease(&g_hiLogDev.mtx); return retval; } -- GitLab