Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fed28611 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Herbert Xu
Browse files

crypto: arch - use crypto_memneq instead of memcmp 



Replace remaining occurences (just as we did in crypto/) under arch/*/crypto/
that make use of memcmp() for comparing keys or authentication tags for
usage with crypto_memneq(). It can simply be used as a drop-in replacement
for the normal memcmp().

Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
Cc: James Yonan <james@openvpn.net>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 369f3dab

arch/s390/crypto/des_s390.c

+3 −3
Original line number Diff line number Diff line
@@ -237,8 +237,8 @@ static int des3_setkey(struct crypto_tfm *tfm, const u8 *key, 
	struct s390_des_ctx *ctx = crypto_tfm_ctx(tfm);

	u32 *flags = &tfm->crt_flags;



	if (!(memcmp(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&

	    memcmp(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],

	if (!(crypto_memneq(key, &key[DES_KEY_SIZE], DES_KEY_SIZE) &&

	    crypto_memneq(&key[DES_KEY_SIZE], &key[DES_KEY_SIZE * 2],

			  DES_KEY_SIZE)) &&

	    (*flags & CRYPTO_TFM_REQ_WEAK_KEY)) {

		*flags |= CRYPTO_TFM_RES_WEAK_KEY;

arch/x86/crypto/aesni-intel_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ static int __driver_rfc4106_decrypt(struct aead_request *req) 
		authTag, auth_tag_len);



	/* Compare generated tag with passed in tag. */

	retval = memcmp(src + tempCipherLen, authTag, auth_tag_len) ?

	retval = crypto_memneq(src + tempCipherLen, authTag, auth_tag_len) ?

		-EBADMSG : 0;



	if (one_entry_in_sg) {