Eric Biggers
a80da82d08
crypto: ccm - fix incompatibility between "ccm" and "ccm_base" ...
commit 6a1faa4a43f5fabf9cbeaa742d916e7b5e73120f upstream.
CCM instances can be created by either the "ccm" template, which only
allows choosing the block cipher, e.g. "ccm(aes)"; or by "ccm_base",
which allows choosing the ctr and cbcmac implementations, e.g.
"ccm_base(ctr(aes-generic),cbcmac(aes-generic))".
However, a "ccm_base" instance prevents a "ccm" instance from being
registered using the same implementations. Nor will the instance be
found by lookups of "ccm". This can be used as a denial of service.
Moreover, "ccm_base" instances are never tested by the crypto
self-tests, even if there are compatible "ccm" tests.
The root cause of these problems is that instances of the two templates
use different cra_names. Therefore, fix these problems by making
"ccm_base" instances set the same cra_name as "ccm" instances, e.g.
"ccm(aes)" instead of "ccm_base(ctr(aes-generic),cbcmac(aes-generic))".
This requires extracting the block cipher name from the name of the ctr
and cbcmac algorithms. It also requires starting to verify that the
algorithms are really ctr and cbcmac using the same block cipher, not
something else entirely. But it would be bizarre if anyone were
actually using non-ccm-compatible algorithms with ccm_base, so this
shouldn't break anyone in practice.
Fixes: 4a49b499dfstable@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2019-05-22 07:37:43 +02:00
Replace magic for trusting the secondary keyring with #define
2018-08-16 09:57:20 -07:00
async_pq: Remove VLA usage
2018-06-18 20:17:38 +05:30
crypto: acomp - add support for 842 via scomp
2016-10-25 11:08:33 +08:00
crypto: ablkcipher - fix crash flushing dcache in error path
2018-08-03 18:06:04 +08:00
crypto: acomp - allow registration of multiple acomps
2017-04-21 20:30:50 +08:00
crypto: aead - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
2019-03-23 20:09:54 +01:00
crypto: aegis/generic - fix for big endian systems
2018-11-13 11:08:46 -08:00
crypto: aegis - fix handling chunked inputs
2019-03-23 20:09:54 +01:00
crypto: aegis - fix handling chunked inputs
2019-03-23 20:09:54 +01:00
crypto: aegis - fix handling chunked inputs
2019-03-23 20:09:54 +01:00
crypto: aes-generic - drop alignment requirement
2017-02-11 17:50:43 +08:00
crypto: aes_ti - disable interrupts while accessing S-box
2019-02-12 19:46:58 +01:00
net: crypto set sk to NULL when af_alg_release.
2019-02-23 09:07:24 +01:00
crypto: hash - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
2019-03-23 20:09:54 +01:00
crypto: Replaced gcc specific attributes with macros from compiler.h
2017-01-13 00:24:39 +08:00
crypto: api - laying defines and checks for statically allocated buffers
2018-04-21 00:58:32 +08:00
crypto: algboss - remove redundant setting of len to zero
2017-10-07 12:10:34 +08:00
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
net: remove sock_no_poll
2018-05-26 09:16:44 +02:00
net: remove sock_no_poll
2018-05-26 09:16:44 +02:00
Revert changes to convert to ->poll_mask() and aio IOCB_CMD_POLL
2018-06-28 10:40:47 -07:00
crypto: ansi_cprng - Convert to new rng interface
2015-04-22 09:30:18 +08:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
evm: Don't deadlock if a crypto algorithm is unavailable
2018-07-18 07:27:22 -04:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
crypto: authenc - fix parsing key with misaligned rta_len
2019-01-22 21:40:32 +01:00
crypto: authencesn - Avoid twice completion call in decrypt path
2019-01-22 21:40:31 +01:00
crypto: blkcipher - fix crash flushing dcache in error path
2018-08-03 18:06:04 +08:00
crypto: blowfish - split generic and common c code
2011-09-22 21:25:25 +10:00
crypto: add missing crypto module aliases
2015-01-13 22:29:11 +11:00
crypto: replace FSF address with web source in license notices
2017-11-29 17:33:25 +11:00
crypto: replace FSF address with web source in license notices
2017-11-29 17:33:25 +11:00
crypto: replace FSF address with web source in license notices
2017-11-29 17:33:25 +11:00
crypto: make tables used from assembler __visible
2013-08-14 20:42:03 +10:00
crypto: do not free algorithm before using
2018-12-13 09:16:21 +01:00
crypto: ccm - fix incompatibility between "ccm" and "ccm_base"
2019-05-22 07:37:43 +02:00
crypto: cfb - remove bogus memcpy() with src == dest
2019-03-23 20:09:40 +01:00
crypto: chacha20 - Fix keystream alignment for chacha20_block()
2017-11-29 17:33:33 +11:00
crypto: chacha20poly1305 - set cra_name correctly
2019-05-22 07:37:36 +02:00
crypto: remove several VLAs
2018-04-21 00:58:34 +08:00
crypto: algapi - make crypto_xor() and crypto_inc() alignment agnostic
2017-02-11 17:52:28 +08:00
crypto: api - Remove no-op exit_ops code
2016-10-21 11:03:42 +08:00
crypto: crc32-generic - remove __crc32_le()
2018-05-27 00:12:09 +08:00
crypto: crc32c-generic - remove cra_alignmask
2018-05-27 00:12:08 +08:00
crypto: crct10dif - Add fallback for broken initrds
2013-09-12 15:31:34 +10:00
crypto: crct10dif-generic - fix use via crypto_shash_digest()
2019-05-22 07:37:37 +02:00
crypto: hash - annotate algorithms taking optional key
2018-01-12 23:03:35 +11:00
crypto: engine - Permit to enqueue all async requests
2018-02-15 23:26:50 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: user - fix leaking uninitialized memory to userspace
2018-11-21 09:19:24 +01:00
crypto: crypto_wq - Fix late crypto work queue initialization
2014-03-21 21:54:28 +08:00
crypto: remove several VLAs
2018-04-21 00:58:34 +08:00
crypto: remove several VLAs
2018-04-21 00:58:34 +08:00
crypto: scomp - add support for deflate rfc1950 (zlib)
2017-04-24 18:11:08 +08:00
crypto: add missing crypto module aliases
2015-01-13 22:29:11 +11:00
crypto: dh - fix memory leak
2018-07-20 13:51:21 +08:00
crypto: dh - make crypto_dh_encode_key() make robust
2018-08-03 18:06:06 +08:00
crypto: drbg - in-place cipher operation for CTR
2018-08-03 18:05:48 +08:00
crypto: include crypto- module prefix in template
2014-11-26 20:06:30 +08:00
crypto: ecc - regularize scalar for scalar multiplication
2019-01-26 09:32:35 +01:00
crypto: ecc - Actually remove stack VLA usage
2018-04-21 00:58:29 +08:00
crypto: ecdh - fix typo of P-192 b value
2018-07-20 13:51:22 +08:00
crypto: ecc - Actually remove stack VLA usage
2018-04-21 00:58:29 +08:00
crypto: ecdh - return unsigned value for crypto_ecdh_key_len()
2017-10-12 22:55:00 +08:00
crypto: echainiv - Remove unused alg/spawn variable
2017-12-22 19:52:45 +11:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
crypto: fips - Move fips_enabled sysctl into fips.c
2015-04-23 14:18:09 +08:00
crypto: gcm - fix incompatibility between "gcm" and "gcm_base"
2019-05-22 07:37:37 +02:00
crypto: gf128mul - remove incorrect comment
2017-12-22 19:52:40 +11:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
keys, trusted: select hash algorithm for TPM2 chips
2015-12-20 15:27:12 +02:00
crypto: hmac - require that the underlying hash algorithm is unkeyed
2017-11-29 13:39:15 +11:00
crypto: api - Make crypto_alg_lookup static
2018-03-31 01:32:58 +08:00
crypto: jitterentropy - drop duplicate header module.h
2016-11-17 23:34:52 +08:00
crypto: jitterentropy - Delete unnecessary checks before the function call "kzfree"
2015-06-25 23:18:33 +08:00
crypto: aes_ti - disable interrupts while accessing S-box
2019-02-12 19:46:58 +01:00
crypto: keywrap - Add missing ULL suffixes for 64-bit constants
2017-11-29 17:33:26 +11:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
crypto: Replaced gcc specific attributes with macros from compiler.h
2017-01-13 00:24:39 +08:00
crypto: lrw - Fix out-of bounds access on counter overflow
2018-11-13 11:08:45 -08:00
crypto: lz4 - fixed decompress function to return error code
2017-04-10 19:17:27 +08:00
crypto: lz4 - fixed decompress function to return error code
2017-04-10 19:17:27 +08:00
treewide: use kv[mz]alloc* rather than opencoded variants
2017-05-08 17:15:13 -07:00
crypto: speck - remove Speck
2018-11-13 11:08:46 -08:00
crypto: mcryptd - remove pointless wrapper functions
2018-02-15 23:26:45 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: memneq - fix for archs without efficient unaligned access
2013-12-09 20:09:12 +08:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
crypto: morus - fix handling chunked inputs
2019-03-23 20:09:54 +01:00
crypto: morus - fix handling chunked inputs
2019-03-23 20:09:54 +01:00
crypto: pcbc - remove bogus memcpy()s with src == dest
2019-03-23 20:09:55 +01:00
crypto: pcrypt - fix freeing pcrypt instances
2017-12-22 19:02:47 +11:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
proc: introduce proc_create_seq{,_data}
2018-05-16 07:23:35 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: rmd256 - use swap macro in rmd256_transform
2018-07-27 19:28:36 +08:00
crypto: rmd320 - use swap macro in rmd320_transform
2018-07-27 19:28:36 +08:00
crypto: rng - ensure that the RNG is ready before using
2017-07-28 17:56:00 +08:00
crypto: rsa-pkcs1pad - Replace GFP_ATOMIC with GFP_KERNEL in pkcs1pad_encrypt_sign_complete
2018-02-15 23:26:47 +08:00
crypto: rsa - Remove unneeded error assignment
2018-04-21 00:58:37 +08:00
kbuild: rename *-asn1.[ch] to *.asn1.[ch]
2018-04-07 19:04:02 +09:00
crypto: rsa - Store rest of the private key components
2016-07-05 23:05:26 +08:00
crypto: akcipher - Changes to asymmetric key API
2015-10-14 22:23:16 +08:00
crypto: salsa20 - don't access already-freed walk.iv
2019-05-22 07:37:36 +02:00
crypto: scatterwalk - remove 'chain' argument from scatterwalk_crypto_chain()
2018-08-03 18:06:03 +08:00
crypto: scompress - use sgl_alloc() and sgl_free()
2018-01-06 09:18:00 -07:00
crypto: prefix module autoloading with "crypto-"
2014-11-24 22:43:57 +08:00
crypto: seqiv - Remove unused alg/spawn variable
2017-12-22 19:52:45 +11:00
crypto: serpent - improve __serpent_setkey with UBSAN
2017-08-09 20:17:54 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
2018-08-03 17:55:12 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: hash - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
2019-03-23 20:09:54 +01:00
crypto: simd - correctly take reqsize of wrapped skcipher into account
2018-12-01 09:37:32 +01:00
crypto: skcipher - don't WARN on unprocessed data after slow walk step
2019-05-22 07:37:37 +02:00
crypto: sm3 - fix undefined shift by >= width of value
2019-01-22 21:40:31 +01:00
crypto: sm4 - export encrypt/decrypt routines to other drivers
2018-05-05 14:52:51 +08:00
crypto: testmgr - add AES-CFB tests
2019-01-09 17:38:44 +01:00
crypto: tcrypt - Add ChaCha20/Poly1305 speed tests
2015-07-17 21:20:20 +08:00
crypto: add missing crypto module aliases
2015-01-13 22:29:11 +11:00
crypto: testmgr - skip crc32c context test for ahash algorithms
2019-03-23 20:09:55 +01:00
crypto: x86/poly1305 - fix overflow during partial reduction
2019-04-27 09:36:37 +02:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: replace FSF address with web source in license notices
2017-11-29 17:33:25 +11:00
crypto: replace FSF address with web source in license notices
2017-11-29 17:33:25 +11:00
crypto: vmac - remove insecure version with hardcoded nonce
2018-07-01 21:00:44 +08:00
crypto: shash - remove useless setting of type flags
2018-07-09 00:30:24 +08:00
crypto: replace FSF address with web source in license notices
2017-11-29 17:33:25 +11:00
kmemcheck: stop using GFP_NOTRACK and SLAB_NOTRACK
2017-11-15 18:21:04 -08:00
crypto: scatterwalk - remove 'chain' argument from scatterwalk_crypto_chain()
2018-08-03 18:06:03 +08:00
crypto: zstd - Add zstd support
2018-04-21 00:58:30 +08:00
a80da82d08