shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-30 10:50:34 +03:00
Code Releases Activity

lvmetad: Fix #845269: SEGV on corrupt lvmetad response.

Browse Source
This commit is contained in:
Petr Rockai 2012-09-19 23:30:16 +02:00
parent d2d6663428
commit c731bb1ee1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/cache/lvmetad.c vendored
View File

@ -86,7 +86,7 @@ static int _token_update()
{
daemon_reply repl = _lvmetad_send("token_update", NULL);
if (strcmp(daemon_reply_str(repl, "response", ""), "OK")) {
if (repl.error || strcmp(daemon_reply_str(repl, "response", ""), "OK")) {
daemon_reply_destroy(repl);
return 0;
}
@ -118,7 +118,7 @@ retry:
daemon_request_destroy(req);
if (!strcmp(daemon_reply_str(repl, "response", ""), "token_mismatch") && try < 2 && !test_mode()) {
if (!repl.error && !strcmp(daemon_reply_str(repl, "response", ""), "token_mismatch") && try < 2 && !test_mode()) {
future_token = _lvmetad_token;
_lvmetad_token = (char *) "update in progress";
if (!_token_update()) goto out;
@ -298,7 +298,7 @@ struct volume_group *lvmetad_vg_lookup(struct cmd_context *cmd, const char *vgna
reply = _lvmetad_send("vg_lookup", "name = %s", vgname, NULL);
}
if (!strcmp(daemon_reply_str(reply, "response", ""), "OK")) {
if (!reply.error && !strcmp(daemon_reply_str(reply, "response", ""), "OK")) {
if (!(top = dm_config_find_node(reply.cft->root, "metadata"))) {
log_error(INTERNAL_ERROR "metadata config node not found.");

2
libdaemon/client/daemon-client.c
View File

@ -81,6 +81,8 @@ daemon_reply daemon_send(daemon_handle h, daemon_request rq)
if (read_buffer(h.socket_fd, &reply.buffer)) {
reply.cft = dm_config_from_string(reply.buffer);
if (!reply.cft)
reply.error = EPROTO;
} else
reply.error = errno;