You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.2 KiB
47 lines
1.2 KiB
1 month ago
|
From f9949a04355f0fca29c6bc02ead8425e76daa573 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Xiao Ni <xni@redhat.com>
|
||
|
|
Date: Fri, 26 Jul 2024 15:14:07 +0800
|
||
|
|
Subject: [PATCH 141/157] mdadm/mdmon: fix coverity issue CHECKED_RETURN
|
||
|
|
|
||
|
|
It needs to check return values when functions have return value.
|
||
|
|
|
||
|
|
Signed-off-by: Xiao Ni <xni@redhat.com>
|
||
|
|
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
---
|
||
|
|
mdmon.c | 11 +++++++++--
|
||
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/mdmon.c b/mdmon.c
|
||
|
|
index 95e350f4..cae63841 100644
|
||
|
|
--- a/mdmon.c
|
||
|
|
+++ b/mdmon.c
|
||
|
|
@@ -198,8 +198,12 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock)
|
||
|
|
/* Wait for monitor to exit by reading from the socket, after
|
||
|
|
* clearing the non-blocking flag */
|
||
|
|
fl = fcntl(sock, F_GETFL, 0);
|
||
|
|
+ if (fl < 0)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
fl &= ~O_NONBLOCK;
|
||
|
|
- fcntl(sock, F_SETFL, fl);
|
||
|
|
+ if (fcntl(sock, F_SETFL, fl) < 0)
|
||
|
|
+ return;
|
||
|
|
n = read(sock, buf, 100);
|
||
|
|
|
||
|
|
/* If there is I/O going on it might took some time to get to
|
||
|
|
@@ -249,7 +253,10 @@ static int make_control_sock(char *devname)
|
||
|
|
listen(sfd, 10);
|
||
|
|
fl = fcntl(sfd, F_GETFL, 0);
|
||
|
|
fl |= O_NONBLOCK;
|
||
|
|
- fcntl(sfd, F_SETFL, fl);
|
||
|
|
+ if (fcntl(sfd, F_SETFL, fl) < 0) {
|
||
|
|
+ close_fd(&sfd);
|
||
|
|
+ return -1;
|
||
|
|
+ }
|
||
|
|
return sfd;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|