[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2] migration: fix bad string passed to error_report
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH v2] migration: fix bad string passed to error_report() |
Date: |
Fri, 05 Feb 2016 09:33:26 +0100 |
User-agent: |
StGit/0.17.1-dirty |
state->name does not contain a terminating '\0' and you may get:
Machine type received is 'pseries-2.3y�?' and local is 'pseries-2.4'
load of migration failed: Invalid argument
Let's add a precision modifier to fix this.
Reviewed-by: Amit Shah <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
---
v2: - added Amit's R-b tag
- added (int) cast to avoid warnings on 32-bit cygwin
---
migration/savevm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 954988d12130..4c361f4b7b6a 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -299,8 +299,8 @@ static int configuration_post_load(void *opaque, int
version_id)
const char *current_name = MACHINE_GET_CLASS(current_machine)->name;
if (strncmp(state->name, current_name, state->len) != 0) {
- error_report("Machine type received is '%s' and local is '%s'",
- state->name, current_name);
+ error_report("Machine type received is '%.*s' and local is '%s'",
+ (int) state->len, state->name, current_name);
return -EINVAL;
}
return 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH v2] migration: fix bad string passed to error_report(),
Greg Kurz <=