From bf70916c0bd278fc0a584204780149d71791acec Mon Sep 17 00:00:00 2001 From: Chris Leech Date: Wed, 5 Jun 2019 09:08:39 -0700 Subject: [PATCH 1/1] Coverity scan fixes --- iscsiuio/src/unix/libs/qedi.c | 2 +- iscsiuio/src/unix/main.c | 3 +++ usr/iscsid.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c index c26744d..e8d3a4e 100644 --- a/iscsiuio/src/unix/libs/qedi.c +++ b/iscsiuio/src/unix/libs/qedi.c @@ -1034,7 +1034,7 @@ static int qedi_read(nic_t *nic, packet_t *pkt) ILOG_DEBUG(PFX "%s:hw_prod %d bd_prod %d, rx_pkt_idx %d, rxlen %d", nic->log_name, hw_prod, bd_prod, rx_bd->rx_pkt_index, len); - ILOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %d", + ILOG_DEBUG(PFX "%s: sw_con %d bd_cons %d num BD %lu", nic->log_name, sw_cons, bd_cons, QEDI_NUM_RX_BD); if (bd_cons != bd_prod) { diff --git a/iscsiuio/src/unix/main.c b/iscsiuio/src/unix/main.c index 645dbe8..b53a243 100644 --- a/iscsiuio/src/unix/main.c +++ b/iscsiuio/src/unix/main.c @@ -451,6 +451,9 @@ int main(int argc, char *argv[]) sigaddset(&set, SIGTERM); sigaddset(&set, SIGUSR1); rc = pthread_sigmask(SIG_SETMASK, &set, NULL); + if (rc != 0) { + ILOG_ERR("Failed to set thread signal mask"); + } /* Spin off the signal handling thread */ pthread_attr_init(&attr); diff --git a/usr/iscsid.c b/usr/iscsid.c index b6f157b..0154359 100644 --- a/usr/iscsid.c +++ b/usr/iscsid.c @@ -516,8 +516,8 @@ int main(int argc, char *argv[]) log_close(log_pid); exit(ISCSI_ERR); } + close(fd); } - close(fd); if ((control_fd = ipc->ctldev_open()) < 0) { log_close(log_pid); -- 2.45.2