* [PATCH] kvm: Ensure negative return value on kvm_init() error handling path
@ 2014-05-30 20:26 Eduardo Habkost
2014-05-30 20:29 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Eduardo Habkost @ 2014-05-30 20:26 UTC (permalink / raw)
To: qemu-devel, Paolo Bonzini; +Cc: kvm
We need to ensure ret < 0 when going through the error path, or QEMU may
try to run the half-initialized VM and crash.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
kvm-all.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kvm-all.c b/kvm-all.c
index 721a390..4e19eff 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1410,7 +1410,7 @@ int kvm_init(MachineClass *mc)
ret = kvm_ioctl(s, KVM_GET_API_VERSION, 0);
if (ret < KVM_API_VERSION) {
- if (ret > 0) {
+ if (ret >= 0) {
ret = -EINVAL;
}
fprintf(stderr, "kvm version too old\n");
@@ -1461,6 +1461,7 @@ int kvm_init(MachineClass *mc)
if (mc->kvm_type) {
type = mc->kvm_type(kvm_type);
} else if (kvm_type) {
+ ret = -EINVAL;
fprintf(stderr, "Invalid argument kvm-type=%s\n", kvm_type);
goto err;
}
@@ -1561,6 +1562,7 @@ int kvm_init(MachineClass *mc)
return 0;
err:
+ assert(ret < 0);
if (s->vmfd >= 0) {
close(s->vmfd);
}
--
1.9.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] kvm: Ensure negative return value on kvm_init() error handling path
2014-05-30 20:26 [PATCH] kvm: Ensure negative return value on kvm_init() error handling path Eduardo Habkost
@ 2014-05-30 20:29 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-05-30 20:29 UTC (permalink / raw)
To: Eduardo Habkost, qemu-devel; +Cc: kvm
Il 30/05/2014 22:26, Eduardo Habkost ha scritto:
> We need to ensure ret < 0 when going through the error path, or QEMU may
> try to run the half-initialized VM and crash.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
> kvm-all.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/kvm-all.c b/kvm-all.c
> index 721a390..4e19eff 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -1410,7 +1410,7 @@ int kvm_init(MachineClass *mc)
>
> ret = kvm_ioctl(s, KVM_GET_API_VERSION, 0);
> if (ret < KVM_API_VERSION) {
> - if (ret > 0) {
> + if (ret >= 0) {
> ret = -EINVAL;
> }
> fprintf(stderr, "kvm version too old\n");
> @@ -1461,6 +1461,7 @@ int kvm_init(MachineClass *mc)
> if (mc->kvm_type) {
> type = mc->kvm_type(kvm_type);
> } else if (kvm_type) {
> + ret = -EINVAL;
> fprintf(stderr, "Invalid argument kvm-type=%s\n", kvm_type);
> goto err;
> }
> @@ -1561,6 +1562,7 @@ int kvm_init(MachineClass *mc)
> return 0;
>
> err:
> + assert(ret < 0);
> if (s->vmfd >= 0) {
> close(s->vmfd);
> }
>
Applied, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-30 20:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-30 20:26 [PATCH] kvm: Ensure negative return value on kvm_init() error handling path Eduardo Habkost
2014-05-30 20:29 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox