Return-Path: Received: from mailapp01.imgtec.com ([195.59.15.196]:62963 "EHLO imgpgp01.kl.imgtec.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752426AbcCLWOW (ORCPT ); Sat, 12 Mar 2016 17:14:22 -0500 Date: Sat, 12 Mar 2016 22:14:19 +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: <20160312221419.GC18071@jhogan-linux.le.imgtec.org> References: <145738314823258@kroah.com> <20160308140108.GM31414@jhogan-linux.le.imgtec.org> <20160308141029.GA29662@kroah.com> <20160308144200.GO31414@jhogan-linux.le.imgtec.org> <20160312063745.GA27793@kroah.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xesSdrSSBC0PokLI" Content-Disposition: inline In-Reply-To: <20160312063745.GA27793@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: --xesSdrSSBC0PokLI Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 11, 2016 at 10:37:45PM -0800, Greg KH wrote: > On Tue, Mar 08, 2016 at 02:42:01PM +0000, James Hogan wrote: > > 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.or= g wrote: > > > > >=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 long= term > > > > > tree, then please email the backport, including the original git = commit > > > > > id to . > > > >=20 > > > > I don't see any conflicts when this is applied to 4.4.4. Asside fro= m 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. > >=20 > > $ 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_U1= 28) { > > 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_U1= 28) { > > 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; > > } > >=20 >=20 > Fails for me: >=20 > ~/linux/stable/linux-4.4.y $ git show 887349f69f37e71e2a8bfbd743831625a0b= 2ff51 | patch -p1 > patching file arch/mips/kvm/mips.c > Reversed (or previously applied) patch detected! Assume -R? [n] > Apply anyway? [n] > Skipping patch. > 2 out of 2 hunks ignored -- saving rejects to file arch/mips/kvm/mips.c.r= ej >=20 >=20 > Is this an issue with 4.4.5 perhaps? >=20 > Ah, do we have duplicate patches here? Look at commit > 0178fd7dcc4451fcb90bec5e91226586962478d2 which is in 4.4.5 now, it's > this same patch... Ah yes, that'd be it. Both Ralf and Paolo applied it. Thanks James --xesSdrSSBC0PokLI Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJW5JS7AAoJEGwLaZPeOHZ6NFQQALUqpSUQxxmcDtwzQFLc30Vr I2+HLL028ZQF/8w9ur2DjmxsNz4VnwylXUzaYrKwomXT2RlCbF+rSTIPCZ8W4K3L /QF7YnrwgzhZJ1rnWT7BhHsbP+6e3aw014cyFvAdBL0FwKORUQlzk414YWYpWkrS N9DIieksLfWB72+89/+C9WRStYU6gnOl/kY0giGpJAZtxUZz0hY1CnG614KwHZiI r2xN5WVLAxlvml3ixto/tYT0/K5s+A6b/SQKKaw3AocDyvLrj3ErAq2vSaEhmnMC zzZp+ABZTjTLXoq5jxoAqiuybbAf67vLK3NZzLATQLi9b0V7Wvbm0x7mB1Qjuz6C Xd87BIwlOYrMFUUw40ZGrFJR7B2M0B8cCfl+Rg+KTHpISwB11MTPVAiNgvQAuijO CvDEBmIMriizqkYbLk4aHGU6ECvrlGI3rdXyG6rsu1wIIy9/lRp0JbxjL6NbTpf4 emTW3iFe8w88WNc1/ohQGbhTbTA07e50QbeCmZy9rM0w6Dija1eSg7PDZFYjKeDr KOdA2+q9b3VYmG8/bLLTMTVFZLFCAfZN0xaoyU20S39FCZ4P1dUV98kESpIcd6zR e3yA4zk9xSBTa4c6WLDzTBirau5LnQBcW0pnvdEC3FewLxljSz078ie9vzDbZSqT 1cpeQqkTuXB44FLN5fqw =36t1 -----END PGP SIGNATURE----- --xesSdrSSBC0PokLI--