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

Commit c8462ca6 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Fix input address type for SMP C1 function 



The smp_c1() so far always assumed public addresses as input for its
operation. However it should provide actually the source address type
of the actual connection.

Finally the source address type is tracked in hci_conn->src_type and
so use that one as input.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 6f59b904

net/bluetooth/smp.c

+10 −8
Original line number Diff line number Diff line
@@ -387,13 +387,13 @@ static void confirm_work(struct work_struct *work) 
	smp->tfm = tfm;



	if (conn->hcon->out)

		ret = smp_c1(tfm, smp->tk, smp->prnd, smp->preq, smp->prsp, 0,

			     &conn->hcon->src, conn->hcon->dst_type,

			     &conn->hcon->dst, res);

		ret = smp_c1(tfm, smp->tk, smp->prnd, smp->preq, smp->prsp,

			     conn->hcon->src_type, &conn->hcon->src,

			     conn->hcon->dst_type, &conn->hcon->dst, res);

	else

		ret = smp_c1(tfm, smp->tk, smp->prnd, smp->preq, smp->prsp,

			     conn->hcon->dst_type, &conn->hcon->dst, 0,

			     &conn->hcon->src, res);

			     conn->hcon->dst_type, &conn->hcon->dst,

			     conn->hcon->src_type, &conn->hcon->src, res);

	if (ret) {

		reason = SMP_UNSPECIFIED;

		goto error;
@@ -427,11 +427,13 @@ static void random_work(struct work_struct *work) 
	BT_DBG("conn %p %s", conn, conn->hcon->out ? "master" : "slave");



	if (hcon->out)

		ret = smp_c1(tfm, smp->tk, smp->rrnd, smp->preq, smp->prsp, 0,

			     &hcon->src, hcon->dst_type, &hcon->dst, res);

		ret = smp_c1(tfm, smp->tk, smp->rrnd, smp->preq, smp->prsp,

			     hcon->src_type, &hcon->src,

			     hcon->dst_type, &hcon->dst, res);

	else

		ret = smp_c1(tfm, smp->tk, smp->rrnd, smp->preq, smp->prsp,

			     hcon->dst_type, &hcon->dst, 0, &hcon->src, res);

			     hcon->dst_type, &hcon->dst,

			     hcon->src_type, &hcon->src, res);

	if (ret) {

		reason = SMP_UNSPECIFIED;

		goto error;