Return-Path: Received: from mailapp01.imgtec.com ([195.59.15.196]:9036 "EHLO imgpgp01.kl.imgtec.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751531AbcCHOmD (ORCPT ); Tue, 8 Mar 2016 09:42:03 -0500 Date: Tue, 8 Mar 2016 14:42:01 +0000 From: James Hogan To: Greg KH CC: , , , Subject: Re: FAILED: patch "[PATCH] MIPS: kvm: Fix ioctl error handling." failed to apply to 4.4-stable tree Message-ID: <20160308144200.GO31414@jhogan-linux.le.imgtec.org> References: <145738314823258@kroah.com> <20160308140108.GM31414@jhogan-linux.le.imgtec.org> <20160308141029.GA29662@kroah.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xexMVKTdXPhpRiVT" Content-Disposition: inline In-Reply-To: <20160308141029.GA29662@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: --xexMVKTdXPhpRiVT Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 08, 2016 at 06:10:29AM -0800, Greg KH wrote: > On Tue, Mar 08, 2016 at 02:01:08PM +0000, James Hogan wrote: > > Hi Greg, > >=20 > > On Mon, Mar 07, 2016 at 12:39:08PM -0800, gregkh@linuxfoundation.org wr= ote: > > >=20 > > > The patch below does not apply to the 4.4-stable tree. > > > If someone wants it applied there, or to any other stable or longterm > > > tree, then please email the backport, including the original git comm= it > > > id to . > >=20 > > I don't see any conflicts when this is applied to 4.4.4. Asside from the > > hashes the cherry-picked commit is identical. Is it conflicting with > > some other stable patch since then or something? >=20 > Try using patch, not 'cherry-pick' and see if it still applies. $ git reset --hard HEAD~ HEAD is now at c252409a688a Linux 4.4.4 $ git show 887349f69f37e71e2a8bfbd743831625a0b2ff51 | patch -p1 patching file arch/mips/kvm/mips.c $ git diff | cat diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c index b9b803facdbf..2683d04fdda5 100644 --- a/arch/mips/kvm/mips.c +++ b/arch/mips/kvm/mips.c @@ -702,7 +702,7 @@ static int kvm_mips_get_reg(struct kvm_vcpu *vcpu, } else if ((reg->id & KVM_REG_SIZE_MASK) =3D=3D KVM_REG_SIZE_U128) { void __user *uaddr =3D (void __user *)(long)reg->addr; =20 - return copy_to_user(uaddr, vs, 16); + return copy_to_user(uaddr, vs, 16) ? -EFAULT : 0; } else { return -EINVAL; } @@ -732,7 +732,7 @@ static int kvm_mips_set_reg(struct kvm_vcpu *vcpu, } else if ((reg->id & KVM_REG_SIZE_MASK) =3D=3D KVM_REG_SIZE_U128) { void __user *uaddr =3D (void __user *)(long)reg->addr; =20 - return copy_from_user(vs, uaddr, 16); + return copy_from_user(vs, uaddr, 16) ? -EFAULT : 0; } else { return -EINVAL; } Cheers James --xexMVKTdXPhpRiVT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJW3uS4AAoJEGwLaZPeOHZ6fh4P/RBWsAcDPealumBuVuH8iKVC DPg2c7/+CeId22jO6GIcj3/5gpxUbZ8irFSKwFw7J7usHbwzQ3cN+tqmdvSnuZ/n Iirwj4GhXIIdw8DJzO6RgENWQ4KYU5cys+136DtvVLR8Bf0G+mOn/SmqIxjXAG7n 0Q9Z4PihLio4ChJ7WCoVk7rTQkk4pLfsRjniMSd+DiQNBnAQiwcQbI7nC3cSx0NE 1x+lJa+iuaiB+2uGqV9VPBnJPx1lSpE0UcXf+KtX+EJ5eLPg05w8/o6csJsfaqLP d/m14gAbD8wI/7yiRDx/QVSJU183nfSuhV8QTuECJ0aUm/70gcVbbucaLWZ5ipi6 l91+eXn/dWeCqwNZYCkxaFJy+h2KVAnY8+rg/NMr/k2NAudQ2ipchePVnAll/cV7 zxBCXYJ7O0RGkDlcj+4ARzGrPs16gQBBWEpvUxii2uegaFIzQzXKKEm7ucvJ3SmO NJ9ivtjRioc/hpAneXr4lty75V+K0S1G+clXIFFFgpzig+sjGvlucP91fnr3/Wda z9AZEARAst8Lf67hFUGeh7q1Z2xkUTDllDxh/kGOeDM7FVU1RCLMm4H9uBgV2xzo M1ZIg8u0V/erBTbVhbt04KF8QQgle/hQHnm/PXRN+v2PRPrJ+l2KBVsRGbXoltmI ak5pMxxhBw0RwJrHsnFM =SK8O -----END PGP SIGNATURE----- --xexMVKTdXPhpRiVT--