Commit ef0bb5ad authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Marcel Holtmann
Browse files

Bluetooth: avoid u128_xor() on potentially misaligned inputs 



u128_xor() takes pointers to quantities that are assumed to be at least
64-bit aligned, which is not guaranteed to be the case in the smp_c1()
routine. So switch to crypto_xor() instead.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b649813e

net/bluetooth/smp.c

+2 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/crypto.h>

#include <crypto/aes.h>

#include <crypto/algapi.h>

#include <crypto/b128ops.h>

#include <crypto/hash.h>

#include <crypto/kpp.h>
@@ -425,7 +424,7 @@ static int smp_c1(const u8 k[16], 
	SMP_DBG("p1 %16phN", p1);



	/* res = r XOR p1 */

	u128_xor((u128 *) res, (u128 *) r, (u128 *) p1);

	crypto_xor_cpy(res, r, p1, sizeof(p1));



	/* res = e(k, res) */

	err = smp_e(k, res);
@@ -442,7 +441,7 @@ static int smp_c1(const u8 k[16], 
	SMP_DBG("p2 %16phN", p2);



	/* res = res XOR p2 */

	u128_xor((u128 *) res, (u128 *) res, (u128 *) p2);

	crypto_xor(res, p2, sizeof(p2));



	/* res = e(k, res) */

	err = smp_e(k, res);