Skip to content

Commit e3c2b10

Browse files
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Catalin Marinas: "Fix memory corruption (overwriting the kmalloc redzone) when saving the SVE state while in SVE streaming mode" * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: sme: Use STR P to clear FFR context field in streaming SVE mode
2 parents d25f002 + 893b241 commit e3c2b10

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

arch/arm64/include/asm/fpsimdmacros.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,12 @@
316316
_for n, 0, 15, _sve_str_p \n, \nxbase, \n - 16
317317
cbz \save_ffr, 921f
318318
_sve_rdffr 0
319-
_sve_str_p 0, \nxbase
320-
_sve_ldr_p 0, \nxbase, -16
321319
b 922f
322320
921:
323-
str xzr, [x\nxbase] // Zero out FFR
321+
_sve_pfalse 0 // Zero out FFR
324322
922:
323+
_sve_str_p 0, \nxbase
324+
_sve_ldr_p 0, \nxbase, -16
325325
mrs x\nxtmp, fpsr
326326
str w\nxtmp, [\xpfpsr]
327327
mrs x\nxtmp, fpcr

0 commit comments

Comments
 (0)