From ddb3e54466d26b4e14159a8436aff32279123ce1 Mon Sep 17 00:00:00 2001 From: shenchenkai Date: Tue, 27 Jun 2023 20:17:34 +0800 Subject: [PATCH] hievent&hilog: check dev.size after acquire mutex lock ohos inclusion category:bugfix issue:#I7GH0X CVE: NA Signed-off-by: shenchenkai --- drivers/staging/hievent/hievent_driver.c | 5 +++++ drivers/staging/hilog/hilog.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/drivers/staging/hievent/hievent_driver.c b/drivers/staging/hievent/hievent_driver.c index d723eae41d14..83c9dc831df7 100644 --- a/drivers/staging/hievent/hievent_driver.c +++ b/drivers/staging/hievent/hievent_driver.c @@ -130,6 +130,11 @@ static ssize_t hievent_read(struct file *file, char __user *user_buf, (void)mutex_lock(&hievent_dev.mtx); + if (hievent_dev.size == 0) { + retval = 0; + goto out; + } + retval = hievent_read_ring_head_buffer((unsigned char *)&header, sizeof(header)); if (retval < 0) { diff --git a/drivers/staging/hilog/hilog.c b/drivers/staging/hilog/hilog.c index 11adcd530849..178dcb6dd5b1 100644 --- a/drivers/staging/hilog/hilog.c +++ b/drivers/staging/hilog/hilog.c @@ -153,6 +153,11 @@ static ssize_t hilog_read(struct file *file, (void)mutex_lock(&hilog_dev.mtx); + if (hilog_dev.size == 0) { + retval = 0; + goto out; + } + retval = hilog_read_ring_head_buffer((unsigned char *)&header, sizeof(header)); if (retval < 0) { -- Gitee