Commit-ID: 5237debb8b3955ac096d2d144360b45605d8827c
Gitweb: http://git.kernel.org/tip/5237debb8b3955ac096d2d144360b45605d8827c
Author: Paul Neumann <paul104x@xxxxxxxx>
AuthorDate: Mon, 13 Aug 2012 18:11:25 +0100
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Wed, 15 Aug 2012 13:16:50 +0300
kvm tools: Fix segfault on "lkvm run"
The segfault is triggered by just running "lkvm run". On my system, it
does not find any kernel, so kvm_cmd_run_init() returns EINVAL which
fails the (r < 0) check in kvm_cmd_run(). Since kvm_cmd_run_init() does
not get to initialize the cpus, kvm_cpus gets mistakenly dereferenced in
kvm_cmd_run_work().
The errors from kvm_cmd_run_init() are not handled properly as they are
returned as positive values.
Acked-by: Asias He <asias.hejun@xxxxxxxxx>
Signed-off-by: Paul Neumann <paul104x@xxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
tools/kvm/builtin-run.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 9e5c1d4..40e147e 100644
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -953,7 +953,7 @@ static int kvm_cmd_run_init(int argc, const char **argv)
fprintf(stderr, "Cannot handle parameter: "
"%s\n", argv[0]);
usage_with_options(run_usage, options);
- return EINVAL;
+ return -EINVAL;
}
if (kvm_run_wrapper == KVM_RUN_SANDBOX) {
/*
@@ -980,7 +980,7 @@ static int kvm_cmd_run_init(int argc, const char **argv)
if (!kernel_filename) {
kernel_usage_with_options();
- return EINVAL;
+ return -EINVAL;
}
vmlinux_filename = find_vmlinux();
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|