On Wed, Sep 06, 2023 at 07:03:36PM +0100, Will Deacon wrote: > From: Joey Gouly <joey.gouly@xxxxxxx> > > commit 387d828adffcf1eb949f3141079c479793c59aac upstream. > > Import the latest version of the Arm Optimized Routines strncmp function based > on the upstream code of string/aarch64/strncmp.S at commit 189dfefe37d5 from: > https://github.com/ARM-software/optimized-routines > > This latest version includes MTE support. > > Note that for simplicity Arm have chosen to contribute this code to Linux under > GPLv2 rather than the original MIT OR Apache-2.0 WITH LLVM-exception license. > Arm is the sole copyright holder for this code. > > Signed-off-by: Joey Gouly <joey.gouly@xxxxxxx> > Cc: Robin Murphy <robin.murphy@xxxxxxx> > Cc: Mark Rutland <mark.rutland@xxxxxxx> > Cc: Catalin Marinas <catalin.marinas@xxxxxxx> > Cc: Will Deacon <will@xxxxxxxxxx> > Acked-by: Mark Rutland <mark.rutland@xxxxxxx> > Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx> > Link: https://lore.kernel.org/r/20220301101435.19327-3-joey.gouly@xxxxxxx > (cherry picked from commit 387d828adffcf1eb949f3141079c479793c59aac) > Cc: <stable@xxxxxxxxxxxxxxx> # 5.15.y only > Fixes: 020b199bc70d ("arm64: Import latest version of Cortex Strings' strncmp") > Reported-by: John Hsu <John.Hsu@xxxxxxxxxxxx> > Link: https://lore.kernel.org/all/e9f30f7d5b7d72a3521da31ab2002b49a26f542e.camel@xxxxxxxxxxxx/ > Signed-off-by: Will Deacon <will@xxxxxxxxxx> > --- > > This is a clean cherry-pick of the latest MTE-safe strncmp() > implementation for arm64 which landed in v5.18 and somewhat accidentally > fixed an out-of-bounds read introduced in v5.14. > An alternative would be to disable the optimised code altogether, but > given that this is self-contained and applies cleanly, I'd favour being > consistent with more recent kernels. > > arch/arm64/lib/strncmp.S | 244 +++++++++++++++++++++++---------------- > 1 file changed, 146 insertions(+), 98 deletions(-) Now queued up, thanks. greg k-h
