diff options
| author | Marian Csontos <mcsontos@redhat.com> | 2015-07-10 11:50:06 +0200 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2015-07-10 16:02:34 +0200 |
| commit | 12f397f164d2cc47b51e54b1d45c7ebff9b90367 (patch) | |
| tree | 2ef8dda082f034106c678ee20db7b1103ab8b860 | |
| parent | 05812f8760393fbdf16600daf1292f9de351cbc5 (diff) | |
| download | lvm2-dev-mcsontos-for-master.tar.gz | |
lvmpolld: Fix segfault on 32 bit architecturesdev-mcsontos-for-master
Explicit conversions are needed to align writes and reads on the stack.
int64_t is popped from stack while int was pushed.
| -rw-r--r-- | daemons/lvmpolld/lvmpolld-core.c | 2 | ||||
| -rw-r--r-- | lib/lvmpolld/lvmpolld-client.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/daemons/lvmpolld/lvmpolld-core.c b/daemons/lvmpolld/lvmpolld-core.c index 9d46c7edd..1da2da229 100644 --- a/daemons/lvmpolld/lvmpolld-core.c +++ b/daemons/lvmpolld/lvmpolld-core.c @@ -529,7 +529,7 @@ static response progress_info(client_handle h, struct lvmpolld_state *ls, reques if (st.polling_finished) r = daemon_reply_simple(LVMPD_RESP_FINISHED, "reason = %s", st.cmd_state.signal ? LVMPD_REAS_SIGNAL : LVMPD_REAS_RETCODE, - LVMPD_PARM_VALUE " = %d", st.cmd_state.signal ?: st.cmd_state.retcode, + LVMPD_PARM_VALUE " = %d", (int64_t)(st.cmd_state.signal ?: st.cmd_state.retcode), NULL); else r = daemon_reply_simple(LVMPD_RESP_IN_PROGRESS, NULL); diff --git a/lib/lvmpolld/lvmpolld-client.c b/lib/lvmpolld/lvmpolld-client.c index 8be2d7b84..f7faa8b1e 100644 --- a/lib/lvmpolld/lvmpolld-client.c +++ b/lib/lvmpolld/lvmpolld-client.c @@ -147,7 +147,7 @@ static struct progress_info _request_progress_info(const char *uuid, unsigned ab } if (abort_polling && - !daemon_request_extend(req, LVMPD_PARM_ABORT " = %d", abort_polling, NULL)) { + !daemon_request_extend(req, LVMPD_PARM_ABORT " = %d", (int64_t)abort_polling, NULL)) { log_error("Failed to create " LVMPD_REQ_PROGRESS " request."); goto out_req; } @@ -228,14 +228,14 @@ static int _process_poll_init(const struct cmd_context *cmd, const char *poll_ty } if (parms->aborting && - !(daemon_request_extend(req, LVMPD_PARM_ABORT " = %d", parms->aborting, NULL))) { + !(daemon_request_extend(req, LVMPD_PARM_ABORT " = %d", (int64_t)(parms->aborting), NULL))) { log_error("Failed to create %s request." , poll_type); goto out_req; } if (cmd->handles_missing_pvs && !(daemon_request_extend(req, LVMPD_PARM_HANDLE_MISSING_PVS " = %d", - cmd->handles_missing_pvs, NULL))) { + (int64_t)(cmd->handles_missing_pvs), NULL))) { log_error("Failed to create %s request." , poll_type); goto out_req; } |