From: Paolo Bonzini <pbonzini@redhat.com>
To: "SF Markus Elfring" <elfring@users.sourceforge.net>,
kvm@vger.kernel.org, linux-mips@linux-mips.org,
"James Hogan" <james.hogan@imgtec.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Ralf Bächle" <ralf@linux-mips.org>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] MIPS: KVM: Return directly after a failed copy_from_user() in kvm_arch_vcpu_ioctl()
Date: Thu, 19 Jan 2017 11:27:52 +0100 [thread overview]
Message-ID: <a1af7ad2-4f3c-36c8-37e8-940e96810cd2@redhat.com> (raw)
In-Reply-To: <7a6b5858-9137-9d20-78fe-6b466081920f@users.sourceforge.net>
On 19/01/2017 11:20, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> 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 <elfring@users.sourceforge.net>
> ---
>
> 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;
> }
>
>
Removing the label makes the patch worthwhile.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
next prev parent reply other threads:[~2017-01-19 10:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 19:52 [PATCH] MIPS: KVM: Return directly after a failed copy_from_user() in kvm_arch_vcpu_ioctl() SF Markus Elfring
2017-01-19 9:50 ` Paolo Bonzini
2017-01-19 10:20 ` [PATCH v2] " SF Markus Elfring
2017-01-19 10:27 ` Paolo Bonzini [this message]
2017-01-19 12:08 ` James Hogan
2017-01-19 11:13 ` [PATCH] " kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a1af7ad2-4f3c-36c8-37e8-940e96810cd2@redhat.com \
--to=pbonzini@redhat.com \
--cc=elfring@users.sourceforge.net \
--cc=james.hogan@imgtec.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
--cc=rkrcmar@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).