From patchwork Fri Jan 20 18:19:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9529157 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 3ED796045F for ; Fri, 20 Jan 2017 18:20:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C466286C6 for ; Fri, 20 Jan 2017 18:20:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 313E9286C8; Fri, 20 Jan 2017 18:20:51 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 D2E55286C6 for ; Fri, 20 Jan 2017 18:20:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbdATSUg (ORCPT ); Fri, 20 Jan 2017 13:20:36 -0500 Received: from mout.web.de ([212.227.15.3]:60251 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828AbdATSUe (ORCPT ); Fri, 20 Jan 2017 13:20:34 -0500 Received: from [192.168.1.2] ([77.182.231.71]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0Lym19-1cR9NI3C3b-0166SR; Fri, 20 Jan 2017 19:19:52 +0100 Subject: [PATCH 01/11] KVM: PPC: Book3S HV: Move assignments for the variable "err" in kvm_htab_write() To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <51bcdd72-467c-8afb-94cb-fd756b3d63a7@users.sourceforge.net> Date: Fri, 20 Jan 2017 19:19:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:nt5NY6zK6LACPboQ2dagFW2GRLBfsI52kTTIHdyMlNZDtGsYVn0 xWc8X0enwmdiI+JIiJ4y9vXQFG9ocw2mM5q3KHLRLkDuUuBVs60a4GZcw3m4OSn9MQpjJRh mW5+ik2hyLNJI3OFwXBybJ3c1Jox8y+qVQpF7pGv08CTWvtQ32QI/A7XJe8FzkKi1418Cbn sG500BPsdqhova1zPGT+g== X-UI-Out-Filterresults: notjunk:1; V01:K0:7eBCWYuZ/uE=:N0J5lfWvesbuyB4Myo1DgS bugOnBzrdI7hIYYBy5EySDo2DCt/UL5XT+nplf19Ci/SFx7Oexi24z4tDPiGv5z1egc1lgl8G UAp6dP3QaXiJ9YkKdMuIs8Vd5fB2+FtVTHfP3yKVOWAhIHyyw0AFH3cIUtxtk3c1yGZUnGi4L uKNarBqbbbigFBKQ6stJhY14/I6gvo7x5Y3DDPJgR5TdwEt53/F5OctBkNkhLX+qLU4pUbgAB a/hiQkYkN/DaaZQGjyd+kfPnG9O4yqu2eGVIaEzJPXrXai5mv4Tfd5x3oGn13ItLV9XtjQxJp DijPhaDDvHxHu0BcoYPAFab7eC7pSVdh2n1sGU1irEzuNdE1D0oUYGsyzJOlieq0Pvgz26sR2 XP7MDg2UvaMmVsHmRM8T72HTLtxGlc7yV9mhPA6RBrFupkxK9OP/Ogi+e0ZFpZR7nVUCbqfTP zDP4sfHF6hmS1pCrJVt8YT6suEoqw5Pcil9b2/rm+ZGRcZPpNz6m5sRqkDTbKvdgF/6Dg3IHT 4uTiOKS095Lsqr+2FrwZ7QFlMOgwtYJhL6H1y0BFcpVGg1e8o3JlfQTu93Pj+Y5VUaAKpNih5 LQJAQDufDRiZk3f0Bgiv4LQMHiKhOS+8IwN7Vt2P7RbZHtr/Ibr8e/WcNaWfiF2E7IE0o1Irb ti/YOliMcqe6CXE4LvZbd84FwRGCljPLfSKaBm0aAr5qx4Qz2LPRzR1SnccRKdzuG5nwPSs41 fKPmHnUCcLLE7uARbTPUfCsgVnbZbUs41YafOYBG10qUvIcyGBB/bl9Fy9Xx9cykPoQHLyfcx mdYxyzp Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Thu, 19 Jan 2017 22:45:56 +0100 * A local variable was set to an error code in five cases before a concrete error situation was detected. Thus move the corresponding assignments into if branches to indicate a software failure there. This issue was detected by using the Coccinelle software. * Delete two zero assignments which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/powerpc/kvm/book3s_64_mmu_hv.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index b795dd1ac2ef..dc34729e4ad0 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -1399,22 +1399,23 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf, err = 0; for (nb = 0; nb + sizeof(hdr) <= count; ) { - err = -EFAULT; - if (__copy_from_user(&hdr, buf, sizeof(hdr))) + if (__copy_from_user(&hdr, buf, sizeof(hdr))) { + err = -EFAULT; break; + } - err = 0; if (nb + hdr.n_valid * HPTE_SIZE > count) break; nb += sizeof(hdr); buf += sizeof(hdr); - err = -EINVAL; i = hdr.index; if (i >= kvm->arch.hpt_npte || - i + hdr.n_valid + hdr.n_invalid > kvm->arch.hpt_npte) + i + hdr.n_valid + hdr.n_invalid > kvm->arch.hpt_npte) { + err = -EINVAL; break; + } hptp = (__be64 *)(kvm->arch.hpt_virt + (i * HPTE_SIZE)); lbuf = (unsigned long __user *)buf; @@ -1422,26 +1423,28 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf, __be64 hpte_v; __be64 hpte_r; - err = -EFAULT; if (__get_user(hpte_v, lbuf) || - __get_user(hpte_r, lbuf + 1)) + __get_user(hpte_r, lbuf + 1)) { + err = -EFAULT; goto out; + } v = be64_to_cpu(hpte_v); r = be64_to_cpu(hpte_r); - err = -EINVAL; - if (!(v & HPTE_V_VALID)) + if (!(v & HPTE_V_VALID)) { + err = -EINVAL; goto out; + } lbuf += 2; nb += HPTE_SIZE; if (be64_to_cpu(hptp[0]) & (HPTE_V_VALID | HPTE_V_ABSENT)) kvmppc_do_h_remove(kvm, 0, i, 0, tmp); - err = -EIO; ret = kvmppc_virtmode_do_h_enter(kvm, H_EXACT, i, v, r, tmp); if (ret != H_SUCCESS) { pr_err("kvm_htab_write ret %ld i=%ld v=%lx " "r=%lx\n", ret, i, v, r); + err = -EIO; goto out; } if (!hpte_setup && is_vrma_hpte(v)) { @@ -1465,7 +1468,6 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf, ++i; hptp += 2; } - err = 0; } out: