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

Commit 06817176 authored by Sebastian Siewior's avatar Sebastian Siewior Committed by Herbert Xu
Browse files

[CRYPTO] api: fix writting into unallocated memory in setkey_aligned 



setkey_unaligned() commited in ca7c3938
overwrites unallocated memory in the following memset() because
I used the wrong buffer length.

Signed-off-by: default avatarSebastian Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d4ac2477

crypto/ablkcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key, unsign 
	alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

	memcpy(alignbuffer, key, keylen);

	ret = cipher->setkey(tfm, alignbuffer, keylen);

	memset(alignbuffer, 0, absize);

	memset(alignbuffer, 0, keylen);

	kfree(buffer);

	return ret;

}

crypto/blkcipher.c

+1 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int 
	alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

	memcpy(alignbuffer, key, keylen);

	ret = cipher->setkey(tfm, alignbuffer, keylen);

	memset(alignbuffer, 0, absize);

	memset(alignbuffer, 0, keylen);

	kfree(buffer);

	return ret;

}

crypto/cipher.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, unsigned int 
	alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

	memcpy(alignbuffer, key, keylen);

	ret = cia->cia_setkey(tfm, alignbuffer, keylen);

	memset(alignbuffer, 0, absize);

	memset(alignbuffer, 0, keylen);

	kfree(buffer);

	return ret;

crypto/hash.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int hash_setkey_unaligned(struct crypto_hash *crt, const u8 *key, 
	alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

	memcpy(alignbuffer, key, keylen);

	ret = alg->setkey(crt, alignbuffer, keylen);

	memset(alignbuffer, 0, absize);

	memset(alignbuffer, 0, keylen);

	kfree(buffer);

	return ret;

}