From patchwork Tue Feb 7 15:34:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 9560407 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EE3D4602B1 for ; Tue, 7 Feb 2017 15:34:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFE75201A4 for ; Tue, 7 Feb 2017 15:34:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D413A204BD; Tue, 7 Feb 2017 15:34:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 666A8201A4 for ; Tue, 7 Feb 2017 15:34:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754851AbdBGPeP (ORCPT ); Tue, 7 Feb 2017 10:34:15 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33147 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753840AbdBGPeO (ORCPT ); Tue, 7 Feb 2017 10:34:14 -0500 Received: by mail-pg0-f66.google.com with SMTP id 194so12416840pgd.0; Tue, 07 Feb 2017 07:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yx6XUrMIyC7YYm2XwHDFdSoOaCYtYfw8H3TleBLQAhY=; b=hJTbUqhzSsEAtrHZXzBUQX/A51cN9cdUw6YHO8O6zDTEOBNLnP4WoItv6uyCnz3KXg TiN6ZqXVJcCY4ckaNPvVdO9ssxxcbFkZWtLtp37eJVPXhEXEMhJen5x9D3GnqB75fLjm +v74yhEIC+DS9DJcLwfVzksvSfAM6nLVqEklRMx69D6M96VYKbm1d+K1OrPaZ03otJQ+ OyOsQIVQvnKp/mTndm3sdMJPt47mMd/nv8+eqnmlgTIPyydxQnL19tnYqR/N70oLnNn3 oppumNupff1SrVO73V9i3hXydGvylIfxoGMuYk2NXGlx6lAhw3Zm4zbuuYbDskRWqn+T YqaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Yx6XUrMIyC7YYm2XwHDFdSoOaCYtYfw8H3TleBLQAhY=; b=SGaQdb/DW4xuVpxNDT18cjcMWFAWidKld4blZcJfXaifr9e0TqeyRpiH1BVhbyg83F pXq14KuUyLS/CJ9rl07fEy+kCz1WZYME28tBdu6Vt0P/E13WQIRy27YV5bEo6Slo1x9M VeAb+l9HCLz+IBFUSuIq9/hOEhlXmMDKWrqgJp0kNyHLYqSXTYnp4A21/Eru9penfPJi 7S0CF6rdf+dxrj1cRZoig73zCAiYVfNBuHl2obKLz2poWtL/YZWl6Nx2Z5+2YOHfuFae 9iTzQ0tF95/X/6fAreG8K3YXG5ONBqnZm1Guf90ZJq0U0ejaeAeTHZYOsAvgYGwHM2NE owGA== X-Gm-Message-State: AIkVDXLoUh0deuQNg5PzUCXFKJax1oL0W1KZ9FLvAhu5LQuNiAbCojv5dxd1AG41Uj4j6A== X-Received: by 10.84.194.37 with SMTP id g34mr26779051pld.105.1486481653594; Tue, 07 Feb 2017 07:34:13 -0800 (PST) Received: from 192.168.0.37 (ec2-52-192-197-227.ap-northeast-1.compute.amazonaws.com. [52.192.197.227]) by smtp.gmail.com with ESMTPSA id o12sm12531238pfg.15.2017.02.07.07.34.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Feb 2017 07:34:13 -0800 (PST) From: Wei Yongjun To: agraf@suse.com, pbonzini@redhat.com, rkrcmar@redhat.com, benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au Cc: Wei Yongjun , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH -next] KVM: PPC: Fix error return code in kvm_vm_ioctl_create_spapr_tce() Date: Tue, 7 Feb 2017 15:34:07 +0000 Message-Id: <20170207153407.22325-1-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.9.3 MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Fix to return error code -ENOMEM from the memory alloc error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun --- arch/powerpc/kvm/book3s_64_vio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c index d71f872..8a4a3f0 100644 --- a/arch/powerpc/kvm/book3s_64_vio.c +++ b/arch/powerpc/kvm/book3s_64_vio.c @@ -173,8 +173,10 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, stt = kzalloc(sizeof(*stt) + npages * sizeof(struct page *), GFP_KERNEL); - if (!stt) + if (!stt) { + ret = -ENOMEM; goto fail; + } stt->liobn = args->liobn; stt->page_shift = args->page_shift; @@ -184,8 +186,10 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, for (i = 0; i < npages; i++) { stt->pages[i] = alloc_page(GFP_KERNEL | __GFP_ZERO); - if (!stt->pages[i]) + if (!stt->pages[i]) { + ret = -ENOMEM; goto fail; + } } kvm_get_kvm(kvm);