Skip to content

Commit 454cb97

Browse files
torvaldstorvalds
committed
Merge tag 'v6.14-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto updates from Herbert Xu: "API: - Remove physical address skcipher walking - Fix boot-up self-test race Algorithms: - Optimisations for x86/aes-gcm - Optimisations for x86/aes-xts - Remove VMAC - Remove keywrap Drivers: - Remove n2 Others: - Fixes for padata UAF - Fix potential rhashtable deadlock by moving schedule_work outside lock" * tag 'v6.14-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (75 commits) rhashtable: Fix rhashtable_try_insert test dt-bindings: crypto: qcom,inline-crypto-engine: Document the SM8750 ICE dt-bindings: crypto: qcom,prng: Document SM8750 RNG dt-bindings: crypto: qcom-qce: Document the SM8750 crypto engine crypto: asymmetric_keys - Remove unused key_being_used_for[] padata: avoid UAF for reorder_work padata: fix UAF in padata_reorder padata: add pd get/put refcnt helper crypto: skcipher - call cond_resched() directly crypto: skcipher - optimize initializing skcipher_walk fields crypto: skcipher - clean up initialization of skcipher_walk::flags crypto: skcipher - fold skcipher_walk_skcipher() into skcipher_walk_virt() crypto: skcipher - remove redundant check for SKCIPHER_WALK_SLOW crypto: skcipher - remove redundant clamping to page size crypto: skcipher - remove unnecessary page alignment of bounce buffer crypto: skcipher - document skcipher_walk_done() and rename some vars crypto: omap - switch from scatter_walk to plain offset crypto: powerpc/p10-aes-gcm - simplify handling of linear associated data crypto: bcm - Drop unused setting of local 'ptr' variable crypto: hisilicon/qm - support new function communication ...
2 parents ae2d4fc + 9d4f8e5 commit 454cb97

File tree

97 files changed

+1361
-5063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1361
-5063
lines changed

‎Documentation/devicetree/bindings/crypto/qcom,inline-crypto-engine.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ properties:
1313
compatible:
1414
items:
1515
- enum:
16+
- qcom,qcs8300-inline-crypto-engine
1617
- qcom,sa8775p-inline-crypto-engine
1718
- qcom,sc7180-inline-crypto-engine
1819
- qcom,sc7280-inline-crypto-engine
1920
- qcom,sm8450-inline-crypto-engine
2021
- qcom,sm8550-inline-crypto-engine
2122
- qcom,sm8650-inline-crypto-engine
23+
- qcom,sm8750-inline-crypto-engine
2224
- const: qcom,inline-crypto-engine
2325

2426
reg:

‎Documentation/devicetree/bindings/crypto/qcom,prng.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,17 @@ properties:
1717
- qcom,prng-ee # 8996 and later using EE
1818
- items:
1919
- enum:
20+
- qcom,ipq5332-trng
21+
- qcom,ipq5424-trng
22+
- qcom,ipq9574-trng
23+
- qcom,qcs8300-trng
2024
- qcom,sa8255p-trng
2125
- qcom,sa8775p-trng
2226
- qcom,sc7280-trng
2327
- qcom,sm8450-trng
2428
- qcom,sm8550-trng
2529
- qcom,sm8650-trng
30+
- qcom,sm8750-trng
2631
- const: qcom,trng
2732

2833
reg:

‎Documentation/devicetree/bindings/crypto/qcom-qce.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ properties:
4545

4646
- items:
4747
- enum:
48+
- qcom,qcs8300-qce
4849
- qcom,sa8775p-qce
4950
- qcom,sc7280-qce
5051
- qcom,sm6350-qce
@@ -53,6 +54,7 @@ properties:
5354
- qcom,sm8450-qce
5455
- qcom,sm8550-qce
5556
- qcom,sm8650-qce
57+
- qcom,sm8750-qce
5658
- const: qcom,sm8150-qce
5759
- const: qcom,qce
5860

‎Documentation/driver-api/crypto/iaa/iaa-crypto.rst‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ The available attributes are:
272272
echo async_irq > /sys/bus/dsa/drivers/crypto/sync_mode
273273

274274
Async mode without interrupts (caller must poll) can be enabled by
275-
writing 'async' to it::
275+
writing 'async' to it (please see Caveat)::
276276

277277
echo async > /sys/bus/dsa/drivers/crypto/sync_mode
278278

@@ -283,6 +283,13 @@ The available attributes are:
283283

284284
The default mode is 'sync'.
285285

286+
Caveat: since the only mechanism that iaa_crypto currently implements
287+
for async polling without interrupts is via the 'sync' mode as
288+
described earlier, writing 'async' to
289+
'/sys/bus/dsa/drivers/crypto/sync_mode' will internally enable the
290+
'sync' mode. This is to ensure correct iaa_crypto behavior until true
291+
async polling without interrupts is enabled in iaa_crypto.
292+
286293
.. _iaa_default_config:
287294

288295
IAA Default Configuration

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20164,7 +20164,7 @@ F: net/rfkill/
2016420164
RHASHTABLE
2016520165
M: Thomas Graf <[email protected]>
2016620166
M: Herbert Xu <[email protected]>
20167-
L: netdev@vger.kernel.org
20167+
L: linux-crypto@vger.kernel.org
2016820168
S: Maintained
2016920169
F: include/linux/rhashtable-types.h
2017020170
F: include/linux/rhashtable.h

‎arch/arm/configs/pxa_defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,6 @@ CONFIG_CRYPTO_TWOFISH=m
652652
CONFIG_CRYPTO_LRW=m
653653
CONFIG_CRYPTO_PCBC=m
654654
CONFIG_CRYPTO_XTS=m
655-
CONFIG_CRYPTO_VMAC=m
656655
CONFIG_CRYPTO_SHA512=m
657656
CONFIG_CRYPTO_TGR192=m
658657
CONFIG_CRYPTO_WP512=m

‎arch/loongarch/configs/loongson3_defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,6 @@ CONFIG_CRYPTO_SERPENT=m
10291029
CONFIG_CRYPTO_TEA=m
10301030
CONFIG_CRYPTO_TWOFISH=m
10311031
CONFIG_CRYPTO_CHACHA20POLY1305=m
1032-
CONFIG_CRYPTO_VMAC=m
10331032
CONFIG_CRYPTO_WP512=m
10341033
CONFIG_CRYPTO_DEFLATE=m
10351034
CONFIG_CRYPTO_LZO=m

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ CONFIG_CRYPTO_ADIANTUM=m
579579
CONFIG_CRYPTO_ARC4=m
580580
CONFIG_CRYPTO_CTS=m
581581
CONFIG_CRYPTO_HCTR2=m
582-
CONFIG_CRYPTO_KEYWRAP=m
583582
CONFIG_CRYPTO_LRW=m
584583
CONFIG_CRYPTO_PCBC=m
585584
CONFIG_CRYPTO_XTS=m
@@ -589,7 +588,6 @@ CONFIG_CRYPTO_MD4=m
589588
CONFIG_CRYPTO_MICHAEL_MIC=m
590589
CONFIG_CRYPTO_RMD160=m
591590
CONFIG_CRYPTO_SM3_GENERIC=m
592-
CONFIG_CRYPTO_VMAC=m
593591
CONFIG_CRYPTO_WP512=m
594592
CONFIG_CRYPTO_XCBC=m
595593
CONFIG_CRYPTO_LZO=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,6 @@ CONFIG_CRYPTO_ADIANTUM=m
536536
CONFIG_CRYPTO_ARC4=m
537537
CONFIG_CRYPTO_CTS=m
538538
CONFIG_CRYPTO_HCTR2=m
539-
CONFIG_CRYPTO_KEYWRAP=m
540539
CONFIG_CRYPTO_LRW=m
541540
CONFIG_CRYPTO_PCBC=m
542541
CONFIG_CRYPTO_XTS=m
@@ -546,7 +545,6 @@ CONFIG_CRYPTO_MD4=m
546545
CONFIG_CRYPTO_MICHAEL_MIC=m
547546
CONFIG_CRYPTO_RMD160=m
548547
CONFIG_CRYPTO_SM3_GENERIC=m
549-
CONFIG_CRYPTO_VMAC=m
550548
CONFIG_CRYPTO_WP512=m
551549
CONFIG_CRYPTO_XCBC=m
552550
CONFIG_CRYPTO_LZO=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,6 @@ CONFIG_CRYPTO_ADIANTUM=m
556556
CONFIG_CRYPTO_ARC4=m
557557
CONFIG_CRYPTO_CTS=m
558558
CONFIG_CRYPTO_HCTR2=m
559-
CONFIG_CRYPTO_KEYWRAP=m
560559
CONFIG_CRYPTO_LRW=m
561560
CONFIG_CRYPTO_PCBC=m
562561
CONFIG_CRYPTO_XTS=m
@@ -566,7 +565,6 @@ CONFIG_CRYPTO_MD4=m
566565
CONFIG_CRYPTO_MICHAEL_MIC=m
567566
CONFIG_CRYPTO_RMD160=m
568567
CONFIG_CRYPTO_SM3_GENERIC=m
569-
CONFIG_CRYPTO_VMAC=m
570568
CONFIG_CRYPTO_WP512=m
571569
CONFIG_CRYPTO_XCBC=m
572570
CONFIG_CRYPTO_LZO=m

0 commit comments

Comments
 (0)