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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

net/bluetooth/mgmt.c

@@ -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))
+	if (hdev_is_powered(hdev)) {
-		return mgmt_cmd_complete(sk, hdev->id,
+		switch (cp->type) {
-					 MGMT_OP_READ_LOCAL_OOB_EXT_DATA,
+		case BIT(BDADDR_BREDR):
-					 MGMT_STATUS_NOT_POWERED,
+			status = mgmt_bredr_support(hdev);
-					 &cp->type, sizeof(cp->type));
+			if (status)
-
+				eir_len = 0;
-	switch (cp->type) {
+			else
-	case BIT(BDADDR_BREDR):
+				eir_len = 5;
-		status = mgmt_bredr_support(hdev);
+			break;
-		if (status)
+		case (BIT(BDADDR_LE_PUBLIC) | BIT(BDADDR_LE_RANDOM)):
-			return mgmt_cmd_complete(sk, hdev->id,
+			status = mgmt_le_support(hdev);
-						 MGMT_OP_READ_LOCAL_OOB_EXT_DATA,
+			if (status)
-						 status, &cp->type,
+				eir_len = 0;
-						 sizeof(cp->type));
+			else
-		eir_len = 5;
+				eir_len = 9 + 3 + 18 + 18 + 3;
-		break;
+			break;
-	case (BIT(BDADDR_LE_PUBLIC) | BIT(BDADDR_LE_RANDOM)):
+		default:
-		status = mgmt_le_support(hdev);
+			status = MGMT_STATUS_INVALID_PARAMS;
-		if (status)
+			eir_len = 0;
-			return mgmt_cmd_complete(sk, hdev->id,
+			break;
-						 MGMT_OP_READ_LOCAL_OOB_EXT_DATA,
+		}
-						 status, &cp->type,
+	} else {
-						 sizeof(cp->type));
+		status = MGMT_STATUS_NOT_POWERED;
-		eir_len = 9 + 3 + 18 + 18 + 3;
+		eir_len = 0;
-		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));
 	}
 
 	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,
+			status = MGMT_STATUS_FAILED;
-						MGMT_OP_READ_LOCAL_OOB_EXT_DATA,
+			goto complete;
-						MGMT_STATUS_FAILED,
-						&cp->type, sizeof(cp->type));
-			goto done;
 		}
 
 		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);
+				status, rp, sizeof(*rp) + eir_len);
-	if (err < 0)
+	if (err < 0 || status)
 		goto done;
 
 	err = mgmt_limited_event(MGMT_EV_LOCAL_OOB_DATA_UPDATED, hdev,