On Thu, Jan 19, 2017 at 11:27:52AM +0100, Paolo Bonzini wrote: > > > On 19/01/2017 11:20, SF Markus Elfring wrote: > > From: Markus Elfring <[email protected]> > > 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 <[email protected]> > > --- > > > > 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 <[email protected]>
Thanks Markus & Paolo. Looks better now. I'll apply for 4.11. Cheers James
signature.asc
Description: Digital signature
