On 30-08-19, 10:42, Mark Rutland wrote: > On Thu, Aug 29, 2019 at 05:04:29PM +0530, Viresh Kumar wrote: > > From: Will Deacon <will.deacon@xxxxxxx> > > > > commit 91b2d3442f6a44dce875670d702af22737ad5eff upstream. > > > > The arm64 futex code has some explicit dereferencing of user pointers > > where performing atomic operations in response to a futex command. This > > patch uses masking to limit any speculative futex operations to within > > the user address space. > > > > Signed-off-by: Will Deacon <will.deacon@xxxxxxx> > > Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx> > > Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx> > > This would have made more sense immediately following patch 11, as in > mainline and the v4.9 backport. Having things applied in the same order > makes it much easier to compare and verify. Ahh, indeed the order was that way in the arm64/kpti branch, but not in the stable branch where it got applied at the end and I followed that order :( Fixed the ordering now. Thanks. -- viresh