From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752836AbdARUAX (ORCPT ); Wed, 18 Jan 2017 15:00:23 -0500 Received: from mout.web.de ([212.227.15.14]:58726 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750894AbdARUAV (ORCPT ); Wed, 18 Jan 2017 15:00:21 -0500 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?= Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] MIPS: KVM: Return directly after a failed copy_from_user() in kvm_arch_vcpu_ioctl() Message-ID: <87aac8b8-4f30-2edd-4688-42d32d815cd1@users.sourceforge.net> Date: Wed, 18 Jan 2017 20:52:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:9qG4qTFLgp7g6dnKdZK6Nq1f7X/Ov5lZXO5uYEn/uZnZxuIKSxt NOHcbwH6Gwnnh0VCGwiYktgVbU2RlrXNUfFoM5AiKhl14iHE7SEvJNGVLlK9KAxBb4eGoKw 4kwuLJj7O/OSClS1c58ykgp/Wt0vvzd82QsYlMvornWaZOZM51NT8/aPgK6vm9Me5zLU9t2 BdEQi65ARhoT7t6x75Qhw== X-UI-Out-Filterresults: notjunk:1;V01:K0:3TCpaOrcwA0=:XpO/pxupYuceufCHbPdjiX h8PJMN6w736snDgjP9lDmPnBZ3OR/IralUzLhbFuF9doLSHjiK1TJ56fOj9KckAf1KdKJR7Z1 eVcPV4QrnTqyvJ/eG1Zj77+wz5jv+qWTMBUcfxKkwHMX0kYPBgzal4fDvH61R9MEpTsPvHYSv mwfE7/IH4MvC8bzN2ZUgWyqv26k8Eopj2QnA3/Sm5nrEe8OU54URhncnHGBScyJqe7o7ppj6I kOQPGtdxTrsmJIdfZ0xz7Nil4C84V1mmty3hzAd3Pr2UfmOix6T0tlIq2Q1PQddwQIYtFWAbu 04rCcMYyjti4NQNus/aB+N5p/4r0cONcELBLvQw+bqGau7CTaZn+GxcUaQKtpske4nlFTU/Db IuLagiPaFmJ8SCAFMoYisRmqkMRJMtkUD+wybp+IxXIQuzPxwLLiEsGTaynxIYqMRsL7UfpVf ESTyCbc/td0US4pTmEtVdBXWHs0CZuYHWgJl0YoAlbcGcPpEUhNgwDOoxqg62m2HTV4gXL7vF 96zQCiT8X8ePl/pIzc7oOb4yVnqJUemAKjvsinwsd+oBp3KV7KN9FUgQK42/ZPCSdKExsyPj+ j/y6g4gbW60BGegE2XYV86kEARp0GqKoCKDyK8HQTcstPed3m5CWISMLLy9EPDzQBGa2h8pm+ IeWVNwYgLzEUMkfhD3kbvFU3CZTlLHSLQZYvdjdJ/mjaTDz6qb4u7GxgWIfaxi7gzYFMgZh8j kDNn/8vPeYs4srq++UKn0eu+N7+IY45+mzz156+JApwCvbAZN6o3PyeBJcfayAMmgU6pqAPrN irO+GiV Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 18 Jan 2017 20:43:41 +0100 Return directly after a call of the function "copy_from_user" failed in a case block. Signed-off-by: Markus Elfring --- arch/mips/kvm/mips.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index 06a60b19acfb..1dad78f74e8c 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,9 +1163,8 @@ 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; } -- 2.11.0