crypto: CFI fixes
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest12 patches 7 repliesIn review
- v111 patches 6 repliesSuperseded
Changes in v2 from the cover letter
- Added patch "crypto: x86/sm4 - fix crash with CFI enabled"
- Restored accidentally-deleted include of <asm/assembler.h>
- Tweaked some commit messages and added Reviewed-by and Acked-by tags
Patches in v2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/12 | crypto: x86/aegis128 - fix possible crash with CFI enabledarch/ | +5 | 0 replies | |
| 2/12 | crypto: x86/aria - fix crash with CFI enabledarch/ | +7 | 0 replies | |
| 3/12 | crypto: x86/nhpoly1305 - eliminate unnecessary CFI wrappersarch/ arch/ arch/ +1 more | +10 | 0 replies | |
| 4/12 | crypto: x86/sha1 - fix possible crash with CFI enabledarch/ arch/ | +4 | 0 replies | |
| 5/12 | crypto: x86/sha256 - fix possible crash with CFI enabledarch/ arch/ arch/ +1 more | +8 | 0 replies | |
| 6/12 | crypto: x86/sha512 - fix possible crash with CFI enabledarch/ arch/ arch/ | +6 | 0 replies | |
| 7/12 | crypto: x86/sm3 - fix possible crash with CFI enabledarch/ | +2 | 0 replies | |
| 8/12 | crypto: x86/sm4 - fix crash with CFI enabledarch/ arch/ | +8 | 6 replies | |
| 9/12 | crypto: arm64/nhpoly1305 - eliminate unnecessary CFI wrapperarch/ arch/ | +5 | 0 replies | |
| 10/12 | crypto: arm64/sm3 - fix possible crash with CFI enabledarch/ | +2 | 0 replies | |
| 11/12 | crypto: arm/nhpoly1305 - eliminate unnecessary CFI wrapperarch/ arch/ | +3 | 0 replies | |
| 12/12 | Revert "crypto: shash - avoid comparing pointers to exported functions under CFI"crypto/ include/ | +10 | 0 replies |
Reviews trailers per patch
11 of 12 patches have a Reviewed-by or Acked-by.
| Patch | Peter Zijlstra (Intel) | Sami Tolvanen |
|---|---|---|
| 1/12 | A-b | R-b |
| 2/12 | A-b | R-b |
| 3/12 | A-b | R-b |
| 4/12 | A-b | R-b |
| 5/12 | A-b | R-b |
| 6/12 | A-b | R-b |
| 7/12 | A-b | R-b |
| 8/12 | ||
| 9/12 | A-b | R-b |
| 10/12 | A-b | R-b |
| 11/12 | A-b | R-b |
| 12/12 | A-b | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v2 00/12] crypto: CFI fixes
This series fixes some crashes when CONFIG_CFI_CLANG (Control Flow Integrity) is enabled, with the new CFI implementation that was merged in 6.1 and is supported on x86. Some of them were unconditional crashes, while others depended on whether the compiler optimized out the indirect calls or not. This series also simplifies some code that was intended to work around limitations of the old CFI implementation and is unnecessary for the new CFI implementation.
Changed in v2:
- Added patch "crypto: x86/sm4 - fix crash with CFI enabled"
- Restored accidentally-deleted include of <asm/assembler.h>
- Tweaked some commit messages and added Reviewed-by and Acked-by tags
Eric Biggers (12):
crypto: x86/aegis128 - fix possible crash with CFI enabled
crypto: x86/aria - fix crash with CFI enabled
crypto: x86/nhpoly1305 - eliminate unnecessary CFI wrappers
crypto: x86/sha1 - fix possible crash with CFI enabled
crypto: x86/sha256 - fix possible crash with CFI enabled
crypto: x86/sha512 - fix possible crash with CFI enabled
crypto: x86/sm3 - fix possible crash with CFI enabled
crypto: x86/sm4 - fix crash with CFI enabled
crypto: arm64/nhpoly1305 - eliminate unnecessary CFI wrapper
crypto: arm64/sm3 - fix possible crash with CFI enabled
crypto: arm/nhpoly1305 - eliminate unnecessary CFI wrapper Revert "crypto: shash - avoid comparing pointers to exported functions
under CFI"
arch/arm/crypto/nh-neon-core.S | 2 +- arch/arm/crypto/nhpoly1305-neon-glue.c | 11 ++--------- arch/arm64/crypto/nh-neon-core.S | 5 +++-- arch/arm64/crypto/nhpoly1305-neon-glue.c | 11 ++--------- arch/arm64/crypto/sm3-neon-core.S | 3 ++- arch/x86/crypto/aegis128-aesni-asm.S | 9 +++++---- arch/x86/crypto/aria-aesni-avx-asm_64.S | 13 +++++++------ arch/x86/crypto/nh-avx2-x86_64.S | 5 +++-- arch/x86/crypto/nh-sse2-x86_64.S | 5 +++-- arch/x86/crypto/nhpoly1305-avx2-glue.c | 11 ++--------- arch/x86/crypto/nhpoly1305-sse2-glue.c | 11 ++--------- arch/x86/crypto/sha1_ni_asm.S | 3 ++- arch/x86/crypto/sha1_ssse3_asm.S | 3 ++- arch/x86/crypto/sha256-avx-asm.S | 3 ++- arch/x86/crypto/sha256-avx2-asm.S | 3 ++- arch/x86/crypto/sha256-ssse3-asm.S | 3 ++- arch/x86/crypto/sha256_ni_asm.S | 3 ++- arch/x86/crypto/sha512-avx-asm.S | 3 ++- arch/x86/crypto/sha512-avx2-asm.S | 3 ++- arch/x86/crypto/sha512-ssse3-asm.S | 3 ++- arch/x86/crypto/sm3-avx-asm_64.S | 3 ++- arch/x86/crypto/sm4-aesni-avx-asm_64.S | 7 ++++--- arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 7 ++++--- crypto/shash.c | 18 +++--------------- include/crypto/internal/hash.h | 8 +++++++- 25 files changed, 70 insertions(+), 86 deletions(-)
base-commit: 75df46b598b5b46b0857ee7d2410deaf215e23d1
Signature · 1 line
2.38.1