reset/sanlk_reset.c | 4 ++++
reset/sanlk_resetd.c | 2 ++
src/main.c | 1 +
src/resource.c | 2 +-
4 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 8b4c8866054666b4c04675a5fc9969705aeef36c
Author: David Teigland <teigland(a)redhat.com>
Date: Mon Sep 8 14:59:05 2014 -0500
sanlock, reset: coverity fixes
Minor things from coverity.
Signed-off-by: David Teigland <teigland(a)redhat.com>
diff --git a/reset/sanlk_reset.c b/reset/sanlk_reset.c
index 9b121e8..63e6616 100644
--- a/reset/sanlk_reset.c
+++ b/reset/sanlk_reset.c
@@ -311,6 +311,8 @@ static int reset_done(void)
if ((rv < 0) || (hs == NULL) || (hs_count != 1) || (hs->host_id != host_id)) {
log_error("sanlock_get_hosts error %d ls %s:%d",
rv, ls_names[i], ls_hostids[i]);
+ if (hs)
+ free(hs);
continue;
}
@@ -441,12 +443,14 @@ static int update_local_daemon(char *cmd)
rv = sendto(s, buf, UPDATE_SIZE, 0, (struct sockaddr *)&update_addr,
update_addrlen);
if (rv < 0) {
printf("Failed to update local sanlk-resetd: %s\n", strerror(errno));
+ close(s);
return EXIT_FAILURE;
} else {
printf("Updated %s %s\n", cmd, ls_names[i]);
}
}
+ close(s);
return EXIT_SUCCESS;
}
diff --git a/reset/sanlk_resetd.c b/reset/sanlk_resetd.c
index d3ea158..3e4c8f5 100644
--- a/reset/sanlk_resetd.c
+++ b/reset/sanlk_resetd.c
@@ -451,6 +451,8 @@ static int setup_update(void)
return rv;
s = setup_resetd_socket();
+ if (s < 0)
+ return s;
unlink(update_addr.sun_path);
rv = bind(s, (struct sockaddr *) &update_addr, update_addrlen);
diff --git a/src/main.c b/src/main.c
index 5d3b270..cfd7f42 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2776,6 +2776,7 @@ static int read_file_leader(struct leader_record *leader, int
is_ls)
memset(line, 0, sizeof(line));
}
+ fclose(file);
new_checksum = leader_checksum(&lr);
diff --git a/src/resource.c b/src/resource.c
index a14de10..9834a84 100644
--- a/src/resource.c
+++ b/src/resource.c
@@ -2157,12 +2157,12 @@ int release_orphan(struct sanlk_resource *res)
count++;
}
}
- pthread_mutex_unlock(&resource_mutex);
if (count) {
resource_thread_work = 1;
pthread_cond_signal(&resource_cond);
}
+ pthread_mutex_unlock(&resource_mutex);
return count;
}
Show replies by date