|
 |
b7a469 |
From 0c300716226027d75afa2b9e5f052fa4868204ae Mon Sep 17 00:00:00 2001
|
|
|
587c20 |
From: Chris Leech <cleech@redhat.com>
|
|
|
587c20 |
Date: Wed, 5 Jun 2019 09:08:39 -0700
|
|
|
587c20 |
Subject: [PATCH] Coverity scan fixes
|
|
|
587c20 |
|
|
|
587c20 |
---
|
|
|
587c20 |
iscsiuio/src/unix/libs/qedi.c | 2 +-
|
|
|
b7a469 |
iscsiuio/src/unix/main.c | 3 +++
|
|
|
587c20 |
libopeniscsiusr/idbm.c | 11 +++++------
|
|
|
587c20 |
usr/idbm.c | 10 ++++------
|
|
|
587c20 |
usr/iscsid.c | 2 +-
|
|
|
b7a469 |
5 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
587c20 |
|
|
|
587c20 |
diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c
|
|
|
50a52f |
index 3414cb5..a359700 100644
|
|
|
587c20 |
--- a/iscsiuio/src/unix/libs/qedi.c
|
|
|
587c20 |
+++ b/iscsiuio/src/unix/libs/qedi.c
|
|
|
587c20 |
@@ -1023,7 +1023,7 @@ static int qedi_read(nic_t *nic, packet_t *pkt)
|
|
|
587c20 |
|
|
|
587c20 |
LOG_DEBUG(PFX "%s:hw_prod %d bd_prod %d, rx_pkt_idx %d, rxlen %d",
|
|
|
587c20 |
nic->log_name, hw_prod, bd_prod, rx_bd->rx_pkt_index, len);
|
|
|
587c20 |
- LOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %d",
|
|
|
587c20 |
+ LOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %lu",
|
|
|
587c20 |
nic->log_name, sw_cons, bd_cons, QEDI_NUM_RX_BD);
|
|
|
587c20 |
|
|
|
587c20 |
if (bd_cons != bd_prod) {
|
|
|
587c20 |
diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c
|
|
|
b7a469 |
index 0c9ad49..f83f305 100644
|
|
|
587c20 |
--- a/iscsiuio/src/unix/main.c
|
|
|
587c20 |
+++ b/iscsiuio/src/unix/main.c
|
|
|
b7a469 |
@@ -391,6 +391,9 @@ int main(int argc, char *argv[])
|
|
|
587c20 |
sigaddset(&set, SIGTERM);
|
|
|
587c20 |
sigaddset(&set, SIGUSR1);
|
|
|
587c20 |
rc = pthread_sigmask(SIG_SETMASK, &set, NULL);
|
|
|
587c20 |
+ if (rc != 0) {
|
|
|
587c20 |
+ LOG_ERR("Failed to set thread signal mask");
|
|
|
587c20 |
+ }
|
|
|
587c20 |
|
|
|
587c20 |
/* Spin off the signal handling thread */
|
|
|
587c20 |
pthread_attr_init(&attr);
|
|
|
587c20 |
diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
|
|
|
b7a469 |
index 7bc2381..7d4c338 100644
|
|
|
587c20 |
--- a/libopeniscsiusr/idbm.c
|
|
|
587c20 |
+++ b/libopeniscsiusr/idbm.c
|
|
|
b7a469 |
@@ -321,12 +321,11 @@ int _idbm_lock(struct iscsi_context *ctx)
|
|
|
587c20 |
return 0;
|
|
|
587c20 |
}
|
|
|
587c20 |
|
|
|
587c20 |
- if (access(LOCK_DIR, F_OK) != 0) {
|
|
|
587c20 |
- if (mkdir(LOCK_DIR, 0660) != 0) {
|
|
|
587c20 |
- _error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
|
|
|
587c20 |
- _strerror(errno, strerr_buff));
|
|
|
587c20 |
- return LIBISCSI_ERR_IDBM;
|
|
|
587c20 |
- }
|
|
|
587c20 |
+ if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
|
|
|
587c20 |
+ (access(LOCK_DIR, F_OK) != 0)) {
|
|
|
587c20 |
+ _error(ctx, "Could not open %s: %d %s", LOCK_DIR, errno,
|
|
|
587c20 |
+ _strerror(errno, strerr_buff));
|
|
|
587c20 |
+ return LIBISCSI_ERR_IDBM;
|
|
|
587c20 |
}
|
|
|
587c20 |
|
|
|
587c20 |
fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
|
|
|
587c20 |
diff --git a/usr/idbm.c b/usr/idbm.c
|
|
|
b7a469 |
index 2498a03..a4bc745 100644
|
|
|
587c20 |
--- a/usr/idbm.c
|
|
|
587c20 |
+++ b/usr/idbm.c
|
|
|
b7a469 |
@@ -1439,12 +1439,10 @@ int idbm_lock(void)
|
|
|
587c20 |
return 0;
|
|
|
587c20 |
}
|
|
|
587c20 |
|
|
|
587c20 |
- if (access(LOCK_DIR, F_OK) != 0) {
|
|
|
587c20 |
- if (mkdir(LOCK_DIR, 0660) != 0) {
|
|
|
587c20 |
- log_error("Could not open %s: %s", LOCK_DIR,
|
|
|
587c20 |
- strerror(errno));
|
|
|
587c20 |
- return ISCSI_ERR_IDBM;
|
|
|
587c20 |
- }
|
|
|
587c20 |
+ if (((mkdir(LOCK_DIR, 0660) != 0) && (errno != EEXIST)) ||
|
|
|
587c20 |
+ (access(LOCK_DIR, F_OK) != 0)) {
|
|
|
587c20 |
+ log_error("Could not open %s: %s", LOCK_DIR, strerror(errno));
|
|
|
587c20 |
+ return ISCSI_ERR_IDBM;
|
|
|
587c20 |
}
|
|
|
587c20 |
|
|
|
587c20 |
fd = open(LOCK_FILE, O_RDWR | O_CREAT, 0666);
|
|
|
587c20 |
diff --git a/usr/iscsid.c b/usr/iscsid.c
|
|
|
b7a469 |
index e501498..dd94a16 100644
|
|
|
587c20 |
--- a/usr/iscsid.c
|
|
|
587c20 |
+++ b/usr/iscsid.c
|
|
|
b7a469 |
@@ -495,8 +495,8 @@ int main(int argc, char *argv[])
|
|
|
587c20 |
log_close(log_pid);
|
|
|
587c20 |
exit(ISCSI_ERR);
|
|
|
587c20 |
}
|
|
|
587c20 |
+ close(fd);
|
|
|
587c20 |
}
|
|
|
587c20 |
- close(fd);
|
|
|
587c20 |
|
|
|
587c20 |
if ((control_fd = ipc->ctldev_open()) < 0) {
|
|
|
587c20 |
log_close(log_pid);
|
|
|
587c20 |
--
|
|
|
b7a469 |
2.26.2
|
|
|
587c20 |
|