From f0dd915c3f318c75320b5d911aea8cf84be2afd4 Mon Sep 17 00:00:00 2001 From: xuyong Date: Fri, 26 May 2023 10:46:30 +0800 Subject: [PATCH] hievent&hilog: return error code directly after wait_event_interruptible returned by system interruption ohos inclusion category:bugfix issue:#I78HU0 CVE: NA Signed-off-by: xuyong --- drivers/staging/hievent/hievent_driver.c | 8 ++------ drivers/staging/hilog/hilog.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/staging/hievent/hievent_driver.c b/drivers/staging/hievent/hievent_driver.c index 4bbee4f77647..d723eae41d14 100644 --- a/drivers/staging/hievent/hievent_driver.c +++ b/drivers/staging/hievent/hievent_driver.c @@ -120,17 +120,13 @@ static int hievent_read_ring_head_buffer(unsigned char * const buffer, static ssize_t hievent_read(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { - int rc; size_t retval; struct hievent_entry header; (void)file; - rc = wait_event_interruptible(hievent_dev.wq, (hievent_dev.size > 0)); - if (rc) { - retval = -EINVAL; - goto out; - } + if (wait_event_interruptible(hievent_dev.wq, (hievent_dev.size > 0))) + return -EINVAL; (void)mutex_lock(&hievent_dev.mtx); diff --git a/drivers/staging/hilog/hilog.c b/drivers/staging/hilog/hilog.c index aaf5f1f21492..11adcd530849 100644 --- a/drivers/staging/hilog/hilog.c +++ b/drivers/staging/hilog/hilog.c @@ -144,16 +144,12 @@ static int hilog_read_ring_head_buffer(unsigned char *buffer, size_t buf_len) static ssize_t hilog_read(struct file *file, char __user *user_buf, size_t count, loff_t *ppos) { - int rc; size_t retval; struct hilog_entry header; (void)file; - rc = wait_event_interruptible(hilog_dev.wq, (hilog_dev.size > 0)); - if (rc) { - retval = -EINVAL; - goto out; - } + if (wait_event_interruptible(hilog_dev.wq, (hilog_dev.size > 0))) + return -EINVAL; (void)mutex_lock(&hilog_dev.mtx); -- Gitee