From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751926AbdASK2R (ORCPT ); Thu, 19 Jan 2017 05:28:17 -0500 Received: from mout.web.de ([212.227.15.3]:53714 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751444AbdASK1q (ORCPT ); Thu, 19 Jan 2017 05:27:46 -0500 Subject: [PATCH v2] MIPS: KVM: Return directly after a failed copy_from_user() in kvm_arch_vcpu_ioctl() To: kvm@vger.kernel.org, linux-mips@linux-mips.org, James Hogan , Paolo Bonzini , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , =?UTF-8?Q?Ralf_B=c3=a4chle?= References: <87aac8b8-4f30-2edd-4688-42d32d815cd1@users.sourceforge.net> <88b008c5-552b-7314-94d8-02214f38a456@redhat.com> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <7a6b5858-9137-9d20-78fe-6b466081920f@users.sourceforge.net> Date: Thu, 19 Jan 2017 11:20:40 +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: <88b008c5-552b-7314-94d8-02214f38a456@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:D5h9mowCzh9bvvrBJu0ts6XJrtWNxbqzcDoQhKpfKA8iYm5pM6j wsW87hO9gyznCyFphysMvfyldLLN8sHJUE6T439K7Qwy8rYeceiCTYI7IfsR2iDJrxR5JYy mLgteONGeBbF9IjLFeaispLwmwWJjlTP6cunxaVWbPclNpHnyp2/Hu9GzCrzOte/TCIaIbo ufZnJRvxK6BH8Aht8JzAg== X-UI-Out-Filterresults: notjunk:1;V01:K0:HFTQWXcCzrQ=:uwT5fW//otgOkO4nLN8KgY LeERUVwE08zv1otTJMpkqy5ZkuQwVTwiiT8uoO4TLjb0gYRWdcHxhWkkgMwAbuXfeosI3vSk1 f8FAy2HuX1SGPhSRUeoJ9NNaNNevQvdaRi9BR/JahyyRNvlbwXt1B+ZwecczX0f2tJWlI7/BJ q0rYR3kkAmaiY5HcFmtimCiaC3j7MzUvWGLvPK7w8RestaTjYn+v2YO/xywRsomshK/Q+SecJ PMfqoOG7sd3TmrIXjreIJb//CxJuhe1A/EhD7w8rStMwVpzMC6cvR930KLJG6eN+sFZ+dhteS y0n6T5mkcLXg5JwtJRp/zhChYiXniNZKvZTkK+L3RocWwXMy3ssX+RV2dZmcun6cd4gVYTZbk nyxkbwH5HyYzCRuYj8p/djyHiRClSs7+8GZ3ATuwlDUGJ0exqo8LVCX/JVpvG+dGtiddweJjY ddD7a7+lk1OKHMwjc3UVktnH6Dlu5gk/Lxb19Ag//0Vd3SwC7ilvX5QerhyyRB98qCbZ1WquL vGZdDvn/mfGMQry30VgmwyVhZ8GquWqK6ohRP6CNa6A6Rv64BiZ7+yj4mTWm+kCp/M1f/ADwK ij8Hy4TPDa1hdprWjoqAuZeHnrf4dA/upBqAkzaG5QQ02KMkMPQg4+TYflTpaDJPutjb6O5aS agCFlLh+mfQIe7CX0mAUcF9Y8NaX8NISMu7vD6G9itjIkTCpIzc5qCgBeO6q1uJwRALpiaR47 Z3Oa+TNKSdM9gV22oIwG6/+JVAProzZeQavhILfiWaBi0ZV8UGadQIjH7B4g5I0Amiu7w5qFA 32R/hJW Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 19 Jan 2017 11:10:26 +0100 * Return directly after a call of the function "copy_from_user" failed in a case block. * Delete the jump label "out" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- V2: A label was also removed at the end. arch/mips/kvm/mips.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 06a60b19acfb..3534a0b9efed 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -1152,10 +1152,8 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, { struct kvm_mips_interrupt irq; - r = -EFAULT; if (copy_from_user(&irq, argp, sizeof(irq))) - goto out; - + return -EFAULT; kvm_debug("[%d] %s: irq: %d\n", vcpu->vcpu_id, __func__, irq.irq); @@ -1165,17 +1163,14 @@ long kvm_arch_vcpu_ioctl(struct file *filp, unsigned int ioctl, case KVM_ENABLE_CAP: { struct kvm_enable_cap cap; - r = -EFAULT; if (copy_from_user(&cap, argp, sizeof(cap))) - goto out; + return -EFAULT; r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap); break; } default: r = -ENOIOCTLCMD; } - -out: return r; } -- 2.11.0