summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2016-12-09 15:17:53 -0600
committerDavid Teigland <teigland@redhat.com>2016-12-09 15:22:30 -0600
commitc459f23565e86eb9a8a116995cda7dcaed858b9f (patch)
tree6de8a1990fefefe4af5ac3c72c707022fce257aa
parent30ad254d84047ffe3eba98943855b53a893390e2 (diff)
downloadlvm2-c459f23565e86eb9a8a116995cda7dcaed858b9f.tar.gz
lvmetad: fix segfault in daemon_reply_simple
missing NULL termination
-rw-r--r--WHATS_NEW1
-rw-r--r--daemons/lvmetad/lvmetad-core.c9
2 files changed, 7 insertions, 3 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 595b66791..37a0dc7a3 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.169 -
=====================================
+ Fix segfault in lvmetad from missing NULL in daemon_reply_simple.
Simplify internal _info_run() and use _setup_task_run() for mknod.
Better API for internal function _setup_task_run.
Avoid using lv_has_target_type() call within lv_info_with_seg_status.
diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c
index ee0c52fa8..1faae11ab 100644
--- a/daemons/lvmetad/lvmetad-core.c
+++ b/daemons/lvmetad/lvmetad-core.c
@@ -2745,7 +2745,8 @@ static response handler(daemon_state s, client_handle h, request r)
"expected = %s", state->token,
"received = %s", token,
"update_pid = " FMTd64, (int64_t)state->update_pid,
- "reason = %s", "another command has populated the cache");
+ "reason = %s", "another command has populated the cache",
+ NULL);
}
DEBUGLOG(state, "token_update end len %d pid %d new token %s",
@@ -2778,7 +2779,8 @@ static response handler(daemon_state s, client_handle h, request r)
"expected = %s", state->token,
"received = %s", token,
"update_pid = " FMTd64, (int64_t)state->update_pid,
- "reason = %s", "another command has populated the cache");
+ "reason = %s", "another command has populated the cache",
+ NULL);
}
/* If a pid doing update was cancelled, ignore its update messages. */
@@ -2793,7 +2795,8 @@ static response handler(daemon_state s, client_handle h, request r)
"expected = %s", state->token,
"received = %s", token,
"update_pid = " FMTd64, (int64_t)state->update_pid,
- "reason = %s", "another command has populated the lvmetad cache");
+ "reason = %s", "another command has populated the lvmetad cache",
+ NULL);
}
pthread_mutex_unlock(&state->token_lock);