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

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

Bluetooth: Fix error returns for Read Local OOB Extended Data commands 



The Read Local OOB Extended Data commands are required to return the
address type and the data length at least. However currently the error
returns only the address type.

To fix this and avoid any extra allocations or stack memory, rearrange
the code so that the same path can be used for error returns.

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

net/bluetooth/mgmt.c

+34 −37
Original line number Diff line number Diff line
@@ -6414,36 +6414,30 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev, 


	BT_DBG("%s", hdev->name);



	if (!hdev_is_powered(hdev))

		return mgmt_cmd_complete(sk, hdev->id,

					 MGMT_OP_READ_LOCAL_OOB_EXT_DATA,

					 MGMT_STATUS_NOT_POWERED,

					 &cp->type, sizeof(cp->type));



	if (hdev_is_powered(hdev)) {

		switch (cp->type) {

		case BIT(BDADDR_BREDR):

			status = mgmt_bredr_support(hdev);

			if (status)

			return mgmt_cmd_complete(sk, hdev->id,

						 MGMT_OP_READ_LOCAL_OOB_EXT_DATA,

						 status, &cp->type,

						 sizeof(cp->type));

				eir_len = 0;

			else

				eir_len = 5;

			break;

		case (BIT(BDADDR_LE_PUBLIC) | BIT(BDADDR_LE_RANDOM)):

			status = mgmt_le_support(hdev);

			if (status)

			return mgmt_cmd_complete(sk, hdev->id,

						 MGMT_OP_READ_LOCAL_OOB_EXT_DATA,

						 status, &cp->type,

						 sizeof(cp->type));

				eir_len = 0;

			else

				eir_len = 9 + 3 + 18 + 18 + 3;

			break;

		default:

		return mgmt_cmd_complete(sk, hdev->id,

					 MGMT_OP_READ_LOCAL_OOB_EXT_DATA,

					 MGMT_STATUS_INVALID_PARAMS,

					 &cp->type, sizeof(cp->type));

			status = MGMT_STATUS_INVALID_PARAMS;

			eir_len = 0;

			break;

		}

	} else {

		status = MGMT_STATUS_NOT_POWERED;

		eir_len = 0;

	}



	rp_len = sizeof(*rp) + eir_len;
@@ -6451,6 +6445,9 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev, 
	if (!rp)

		return -ENOMEM;



	if (status)

		goto complete;



	hci_dev_lock(hdev);



	eir_len = 0;
@@ -6463,11 +6460,8 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev, 
		if (hci_dev_test_flag(hdev, HCI_SC_ENABLED) &&

		    smp_generate_oob(hdev, hash, rand) < 0) {

			hci_dev_unlock(hdev);

			err = mgmt_cmd_complete(sk, hdev->id,

						MGMT_OP_READ_LOCAL_OOB_EXT_DATA,

						MGMT_STATUS_FAILED,

						&cp->type, sizeof(cp->type));

			goto done;

			status = MGMT_STATUS_FAILED;

			goto complete;

		}



		if (hci_dev_test_flag(hdev, HCI_PRIVACY)) {
@@ -6519,12 +6513,15 @@ static int read_local_oob_ext_data(struct sock *sk, struct hci_dev *hdev, 


	hci_sock_set_flag(sk, HCI_MGMT_OOB_DATA_EVENTS);



	status = MGMT_STATUS_SUCCESS;



complete:

	rp->type = cp->type;

	rp->eir_len = cpu_to_le16(eir_len);



	err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_LOCAL_OOB_EXT_DATA,

				MGMT_STATUS_SUCCESS, rp, sizeof(*rp) + eir_len);

	if (err < 0)

				status, rp, sizeof(*rp) + eir_len);

	if (err < 0 || status)

		goto done;



	err = mgmt_limited_event(MGMT_EV_LOCAL_OOB_DATA_UPDATED, hdev,