From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com ([66.111.4.27]:33951 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750708AbeDSHC0 (ORCPT ); Thu, 19 Apr 2018 03:02:26 -0400 Date: Thu, 19 Apr 2018 09:02:19 +0200 From: Greg KH To: Mark Rutland Cc: stable@vger.kernel.org, mark.brown@linaro.org, ard.biesheuvel@linaro.org, marc.zyngier@arm.com, will.deacon@arm.com, catalin.marinas@arm.com, ghackmann@google.com, shankerd@codeaurora.org Subject: Re: [PATCH v4.9.y 10/42] arm64: futex: Mask __user pointers prior to dereference Message-ID: <20180419070219.GA23948@kroah.com> References: <20180412111138.40990-1-mark.rutland@arm.com> <20180412111138.40990-11-mark.rutland@arm.com> <20180417121003.GA10401@kroah.com> <20180418105635.3pwxyldxsqvsmcbc@lakrids.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180418105635.3pwxyldxsqvsmcbc@lakrids.cambridge.arm.com> Sender: stable-owner@vger.kernel.org List-ID: On Wed, Apr 18, 2018 at 11:56:36AM +0100, Mark Rutland wrote: > On Tue, Apr 17, 2018 at 02:10:03PM +0200, Greg KH wrote: > > This patch doesn't apply at all as it conflicts with commit > > d7c5f8c815466fc00785bbff20f25b39643abe01 which was commit 5f16a046f8e1 > > ("arm64: futex: Fix undefined behaviour with FUTEX_OP_OPARG_SHIFT > > usage") upstream. > > > > Any chance you can provide a correct backport of this? > > The below is rebased atop of the conflicting patch (I based it on > v4.9.94). Luckily it's just a trivial conflict in the function > prototype. > > Is this the right way to resend this? That works, now queued up, thanks. greg k-h