summaryrefslogtreecommitdiffstats
path: root/daemons/clvmd/refresh_clvmd.c
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2011-03-29 21:05:39 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2011-03-29 21:05:39 +0000
commit7f0d89f8b4d70b5229f6ae93e81e985175e82e62 (patch)
treee46c16defa532429aca612df58a914004087fdbe /daemons/clvmd/refresh_clvmd.c
parentaaf92617b0ad642ec99483141ad588982cf921d8 (diff)
downloadlvm2-7f0d89f8b4d70b5229f6ae93e81e985175e82e62.tar.gz
lvm2-7f0d89f8b4d70b5229f6ae93e81e985175e82e62.tar.xz
lvm2-7f0d89f8b4d70b5229f6ae93e81e985175e82e62.zip
Fix sending uninitilised bytes in cluster messages
Fix 2 more functions sending cluster messages to avoid passing uninitilised bytes and compensate 1 extra byte attached to the message from the clvm_header.args[1] member variable.
Diffstat (limited to 'daemons/clvmd/refresh_clvmd.c')
-rw-r--r--daemons/clvmd/refresh_clvmd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/daemons/clvmd/refresh_clvmd.c b/daemons/clvmd/refresh_clvmd.c
index 1e88b5cc..9c0fb4fb 100644
--- a/daemons/clvmd/refresh_clvmd.c
+++ b/daemons/clvmd/refresh_clvmd.c
@@ -154,6 +154,7 @@ static void _build_header(struct clvm_header *head, int cmd, const char *node,
head->cmd = cmd;
head->status = 0;
head->flags = 0;
+ head->xid = 0;
head->clientid = 0;
head->arglen = len;
@@ -197,11 +198,12 @@ static int _cluster_request(char cmd, const char *node, void *data, int len,
if (_clvmd_sock == -1)
return 0;
- _build_header(head, cmd, node, len);
+ /* 1 byte is used from struct clvm_header.args[1], so -> len - 1 */
+ _build_header(head, cmd, node, len - 1);
memcpy(head->node + strlen(head->node) + 1, data, len);
status = _send_request(outbuf, sizeof(struct clvm_header) +
- strlen(head->node) + len, &retbuf, no_response);
+ strlen(head->node) + len - 1, &retbuf, no_response);
if (!status || no_response)
goto out;