From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyrill Gorcunov Subject: Re: [PATCH] kvm tools: Fix segfault when failing to initialize KVM Date: Wed, 1 Feb 2012 11:19:05 +0400 Message-ID: <20120201071905.GA1924@moon> References: <1328062060-17262-1-git-send-email-levinsasha928@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Sasha Levin , mingo@elte.hu, asias.hejun@gmail.com, kvm@vger.kernel.org To: Pekka Enberg Return-path: Received: from mail-bk0-f46.google.com ([209.85.214.46]:52331 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751115Ab2BAHTJ (ORCPT ); Wed, 1 Feb 2012 02:19:09 -0500 Received: by bkcjm19 with SMTP id jm19so722899bkc.19 for ; Tue, 31 Jan 2012 23:19:08 -0800 (PST) Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On Wed, Feb 01, 2012 at 09:05:34AM +0200, Pekka Enberg wrote: > On Tue, 31 Jan 2012, Sasha Levin wrote: > >Might happen when hardware virtualization is not supported. > > > >Reported-by: Ingo Molnar > >Signed-off-by: Sasha Levin > >--- > >tools/kvm/builtin-run.c | 4 ++++ > >1 files changed, 4 insertions(+), 0 deletions(-) > > > >diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c > >index 6ded1d2..a67faf8 100644 > >--- a/tools/kvm/builtin-run.c > >+++ b/tools/kvm/builtin-run.c > >@@ -997,6 +997,10 @@ static int kvm_cmd_run_init(int argc, const char **argv) > > } > > > > kvm = kvm__init(dev, hugetlbfs_path, ram_size, guest_name); > >+ if (IS_ERR_OR_NULL(kvm)) { > >+ r = PTR_ERR(kvm); > > How is this going to work when 'kvm' is NULL? It'd be best if > kvm_init() never returned NULL on error. > > >+ goto fail; > >+ } > > > > kvm->single_step = single_step; > > I suspect we need something like --- tools/kvm/builtin-run.c | 5 +++++ tools/kvm/kvm.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) Index: linux-2.6.git/tools/kvm/builtin-run.c =================================================================== --- linux-2.6.git.orig/tools/kvm/builtin-run.c +++ linux-2.6.git/tools/kvm/builtin-run.c @@ -997,6 +997,11 @@ static int kvm_cmd_run_init(int argc, co } kvm = kvm__init(dev, hugetlbfs_path, ram_size, guest_name); + if (IS_ERR(kvm)) { + r = (int)PTR_ERR(kvm); + pr_err("Can't initialize KVM, failed with error %d\n", r); + goto fail; + } kvm->single_step = single_step; Index: linux-2.6.git/tools/kvm/kvm.c =================================================================== --- linux-2.6.git.orig/tools/kvm/kvm.c +++ linux-2.6.git/tools/kvm/kvm.c @@ -340,7 +340,7 @@ struct kvm *kvm__init(const char *kvm_de } kvm = kvm__new(); - if (IS_ERR_OR_NULL(kvm)) + if (IS_ERR(kvm)) return kvm; kvm->sys_fd = open(kvm_dev, O_RDWR);