ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7103 from leoetlino/master 

BTReal: Fix unsafe reinterpret_casts
This commit is contained in:
Mat M 2018-06-10 14:27:19 -04:00 committed by GitHub
parent 70417c8d16 8bb08d1ca6
commit b6592723a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Source/Core/Core/IOS/USB/Bluetooth/BTReal.cpp
View File

@ -356,17 +356,19 @@ void BluetoothReal::TriggerSyncButtonHeldEvent()
void BluetoothReal::WaitForHCICommandComplete(const u16 opcode)
{
int actual_length;
std::vector<u8> buffer(1024);
SHCIEventCommand packet;
// Only try 100 transfers at most, to avoid being stuck in an infinite loop
for (int tries = 0; tries < 100; ++tries)
{
if (libusb_interrupt_transfer(m_handle, HCI_EVENT, buffer.data(),
static_cast<int>(buffer.size()), &actual_length, 20) == 0 &&
reinterpret_cast<hci_event_hdr_t*>(buffer.data())->event == HCI_EVENT_COMMAND_COMPL &&
reinterpret_cast<SHCIEventCommand*>(buffer.data())->Opcode == opcode)
const int ret = libusb_interrupt_transfer(m_handle, HCI_EVENT, reinterpret_cast<u8*>(&packet),
sizeof(packet), &actual_length, 20);
if (ret == 0 && actual_length == sizeof(packet) &&
packet.EventType == HCI_EVENT_COMMAND_COMPL && packet.Opcode == opcode)
{
break;
}
}
}
void BluetoothReal::SendHCIResetCommand()
{
@ -381,18 +383,19 @@ void BluetoothReal::SendHCIResetCommand()
void BluetoothReal::SendHCIDeleteLinkKeyCommand()
{
const u8 type = LIBUSB_ENDPOINT_OUT | LIBUSB_REQUEST_TYPE_CLASS | LIBUSB_RECIPIENT_INTERFACE;
std::vector<u8> packet(sizeof(hci_cmd_hdr_t) + sizeof(hci_delete_stored_link_key_cp));
struct Payload
{
hci_cmd_hdr_t header;
hci_delete_stored_link_key_cp command;
};
Payload payload;
payload.header.opcode = HCI_CMD_DELETE_STORED_LINK_KEY;
payload.header.length = sizeof(payload.command);
payload.command.bdaddr = {};
payload.command.delete_all = true;
auto* header = reinterpret_cast<hci_cmd_hdr_t*>(packet.data());
header->opcode = HCI_CMD_DELETE_STORED_LINK_KEY;
header->length = sizeof(hci_delete_stored_link_key_cp);
auto* cmd =
reinterpret_cast<hci_delete_stored_link_key_cp*>(packet.data() + sizeof(hci_cmd_hdr_t));
cmd->bdaddr = {};
cmd->delete_all = true;
libusb_control_transfer(m_handle, type, 0, 0, 0, packet.data(), static_cast<u16>(packet.size()),
TIMEOUT);
libusb_control_transfer(m_handle, type, 0, 0, 0, reinterpret_cast<u8*>(&payload),
static_cast<u16>(sizeof(payload)), TIMEOUT);
}
bool BluetoothReal::SendHCIStoreLinkKeyCommand()
@ -407,13 +410,14 @@ bool BluetoothReal::SendHCIStoreLinkKeyCommand()
(sizeof(bdaddr_t) + sizeof(linkkey_t)) * static_cast<u8>(m_link_keys.size());
std::vector<u8> packet(sizeof(hci_cmd_hdr_t) + payload_size);
auto* header = reinterpret_cast<hci_cmd_hdr_t*>(packet.data());
header->opcode = HCI_CMD_WRITE_STORED_LINK_KEY;
header->length = payload_size;
hci_cmd_hdr_t header{};
header.opcode = HCI_CMD_WRITE_STORED_LINK_KEY;
header.length = payload_size;
std::memcpy(packet.data(), &header, sizeof(header));
auto* cmd =
reinterpret_cast<hci_write_stored_link_key_cp*>(packet.data() + sizeof(hci_cmd_hdr_t));
cmd->num_keys_write = static_cast<u8>(m_link_keys.size());
hci_write_stored_link_key_cp command{};
command.num_keys_write = static_cast<u8>(m_link_keys.size());
std::memcpy(packet.data() + sizeof(hci_cmd_hdr_t), &command, sizeof(command));
// This is really ugly, but necessary because of the HCI command structure:
// u8 num_keys;
@ -660,20 +664,20 @@ void BluetoothReal::HandleBulkOrIntrTransfer(libusb_transfer* tr)
if (tr->status == LIBUSB_TRANSFER_COMPLETED && tr->endpoint == HCI_EVENT)
{
const auto* event = reinterpret_cast<hci_event_hdr_t*>(tr->buffer);
if (event->event == HCI_EVENT_LINK_KEY_NOTIFICATION)
const u8 event = tr->buffer[0];
if (event == HCI_EVENT_LINK_KEY_NOTIFICATION)
{
const auto* notification =
reinterpret_cast<hci_link_key_notification_ep*>(tr->buffer + sizeof(hci_event_hdr_t));
hci_link_key_notification_ep notification;
std::memcpy(&notification, tr->buffer + sizeof(hci_event_hdr_t), sizeof(notification));
linkkey_t key;
std::copy(std::begin(notification->key), std::end(notification->key), std::begin(key));
m_link_keys[notification->bdaddr] = key;
std::copy(std::begin(notification.key), std::end(notification.key), std::begin(key));
m_link_keys[notification.bdaddr] = key;
}
else if (event->event == HCI_EVENT_COMMAND_COMPL &&
reinterpret_cast<hci_command_compl_ep*>(tr->buffer + sizeof(*event))->opcode ==
HCI_CMD_RESET)
else if (event == HCI_EVENT_COMMAND_COMPL)
{
hci_command_compl_ep complete_event;
std::memcpy(&complete_event, tr->buffer + sizeof(hci_event_hdr_t), sizeof(complete_event));
if (complete_event.opcode == HCI_CMD_RESET)
m_need_reset_keys.Set();
}
}