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

Commit 9143b886 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "RootCanal: Validate the Supported Commands mask"

parents 2c2ecf51 0eb595e7

system/gd/btaa/linux_generic/cmd_evt_classification.cc

+4 −4
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ CmdEvtActivityClassification lookup_cmd(hci::OpCode opcode) { 
    case hci::OpCode::WRITE_SYNCHRONOUS_FLOW_CONTROL_ENABLE:

    case hci::OpCode::SET_CONTROLLER_TO_HOST_FLOW_CONTROL:

    case hci::OpCode::HOST_BUFFER_SIZE:

    case hci::OpCode::HOST_NUM_COMPLETED_PACKETS:

    case hci::OpCode::HOST_NUMBER_OF_COMPLETED_PACKETS:

    case hci::OpCode::READ_NUMBER_OF_SUPPORTED_IAC:

    case hci::OpCode::READ_CURRENT_IAC_LAP:

    case hci::OpCode::WRITE_CURRENT_IAC_LAP:
@@ -181,13 +181,13 @@ CmdEvtActivityClassification lookup_cmd(hci::OpCode opcode) { 
    case hci::OpCode::READ_LOCAL_SUPPORTED_CODEC_CAPABILITIES:

    case hci::OpCode::READ_LOCAL_SUPPORTED_CONTROLLER_DELAY:

    case hci::OpCode::READ_LOCAL_OOB_DATA:

    case hci::OpCode::LE_GENERATE_DHKEY_COMMAND:

    case hci::OpCode::LE_GENERATE_DHKEY_V2:

    case hci::OpCode::LE_MODIFY_SLEEP_CLOCK_ACCURACY:

    case hci::OpCode::LE_READ_BUFFER_SIZE_V2:

    case hci::OpCode::LE_READ_SUGGESTED_DEFAULT_DATA_LENGTH:

    case hci::OpCode::LE_WRITE_SUGGESTED_DEFAULT_DATA_LENGTH:

    case hci::OpCode::LE_READ_LOCAL_P_256_PUBLIC_KEY_COMMAND:

    case hci::OpCode::LE_GENERATE_DHKEY_COMMAND_V1:

    case hci::OpCode::LE_READ_LOCAL_P_256_PUBLIC_KEY:

    case hci::OpCode::LE_GENERATE_DHKEY_V1:

    case hci::OpCode::LE_SET_EVENT_MASK:

    case hci::OpCode::LE_READ_BUFFER_SIZE_V1:

    case hci::OpCode::LE_READ_LOCAL_SUPPORTED_FEATURES:

system/gd/hci/controller.cc

+96 −49
Original line number Diff line number Diff line
@@ -665,6 +665,26 @@ struct Controller::impl { 
      OP_CODE_MAPPING(READ_REMOTE_VERSION_INFORMATION)

      OP_CODE_MAPPING(READ_CLOCK_OFFSET)

      OP_CODE_MAPPING(READ_LMP_HANDLE)

      OP_CODE_MAPPING(SETUP_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(ACCEPT_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(REJECT_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(IO_CAPABILITY_REQUEST_REPLY)

      OP_CODE_MAPPING(USER_CONFIRMATION_REQUEST_REPLY)

      OP_CODE_MAPPING(USER_CONFIRMATION_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(USER_PASSKEY_REQUEST_REPLY)

      OP_CODE_MAPPING(USER_PASSKEY_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(REMOTE_OOB_DATA_REQUEST_REPLY)

      OP_CODE_MAPPING(REMOTE_OOB_DATA_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(IO_CAPABILITY_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(ENHANCED_SETUP_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(ENHANCED_ACCEPT_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(TRUNCATED_PAGE)

      OP_CODE_MAPPING(TRUNCATED_PAGE_CANCEL)

      OP_CODE_MAPPING(SET_CONNECTIONLESS_PERIPHERAL_BROADCAST)

      OP_CODE_MAPPING(SET_CONNECTIONLESS_PERIPHERAL_BROADCAST_RECEIVE)

      OP_CODE_MAPPING(START_SYNCHRONIZATION_TRAIN)

      OP_CODE_MAPPING(RECEIVE_SYNCHRONIZATION_TRAIN)

      OP_CODE_MAPPING(REMOTE_OOB_EXTENDED_DATA_REQUEST_REPLY)

      OP_CODE_MAPPING(HOLD_MODE)

      OP_CODE_MAPPING(SNIFF_MODE)

      OP_CODE_MAPPING(EXIT_SNIFF_MODE)
@@ -676,6 +696,7 @@ struct Controller::impl { 
      OP_CODE_MAPPING(READ_DEFAULT_LINK_POLICY_SETTINGS)

      OP_CODE_MAPPING(WRITE_DEFAULT_LINK_POLICY_SETTINGS)

      OP_CODE_MAPPING(FLOW_SPECIFICATION)

      OP_CODE_MAPPING(SNIFF_SUBRATING)

      OP_CODE_MAPPING(SET_EVENT_MASK)

      OP_CODE_MAPPING(RESET)

      OP_CODE_MAPPING(SET_EVENT_FILTER)
@@ -714,7 +735,7 @@ struct Controller::impl { 
      OP_CODE_MAPPING(WRITE_SYNCHRONOUS_FLOW_CONTROL_ENABLE)

      OP_CODE_MAPPING(SET_CONTROLLER_TO_HOST_FLOW_CONTROL)

      OP_CODE_MAPPING(HOST_BUFFER_SIZE)

      OP_CODE_MAPPING(HOST_NUM_COMPLETED_PACKETS)

      OP_CODE_MAPPING(HOST_NUMBER_OF_COMPLETED_PACKETS)

      OP_CODE_MAPPING(READ_LINK_SUPERVISION_TIMEOUT)

      OP_CODE_MAPPING(WRITE_LINK_SUPERVISION_TIMEOUT)

      OP_CODE_MAPPING(READ_NUMBER_OF_SUPPORTED_IAC)
@@ -729,48 +750,72 @@ struct Controller::impl { 
      OP_CODE_MAPPING(WRITE_PAGE_SCAN_TYPE)

      OP_CODE_MAPPING(READ_AFH_CHANNEL_ASSESSMENT_MODE)

      OP_CODE_MAPPING(WRITE_AFH_CHANNEL_ASSESSMENT_MODE)

      OP_CODE_MAPPING(READ_EXTENDED_INQUIRY_RESPONSE)

      OP_CODE_MAPPING(WRITE_EXTENDED_INQUIRY_RESPONSE)

      OP_CODE_MAPPING(REFRESH_ENCRYPTION_KEY)

      OP_CODE_MAPPING(READ_SIMPLE_PAIRING_MODE)

      OP_CODE_MAPPING(WRITE_SIMPLE_PAIRING_MODE)

      OP_CODE_MAPPING(READ_LOCAL_OOB_DATA)

      OP_CODE_MAPPING(READ_INQUIRY_RESPONSE_TRANSMIT_POWER_LEVEL)

      OP_CODE_MAPPING(WRITE_INQUIRY_TRANSMIT_POWER_LEVEL)

      OP_CODE_MAPPING(READ_DEFAULT_ERRONEOUS_DATA_REPORTING)

      OP_CODE_MAPPING(WRITE_DEFAULT_ERRONEOUS_DATA_REPORTING)

      OP_CODE_MAPPING(ENHANCED_FLUSH)

      OP_CODE_MAPPING(SEND_KEYPRESS_NOTIFICATION)

      OP_CODE_MAPPING(SET_EVENT_MASK_PAGE_2)

      OP_CODE_MAPPING(READ_FLOW_CONTROL_MODE)

      OP_CODE_MAPPING(WRITE_FLOW_CONTROL_MODE)

      OP_CODE_MAPPING(READ_ENHANCED_TRANSMIT_POWER_LEVEL)

      OP_CODE_MAPPING(READ_LE_HOST_SUPPORT)

      OP_CODE_MAPPING(WRITE_LE_HOST_SUPPORT)

      OP_CODE_MAPPING(SET_MWS_CHANNEL_PARAMETERS)

      OP_CODE_MAPPING(SET_EXTERNAL_FRAME_CONFIGURATION)

      OP_CODE_MAPPING(SET_MWS_SIGNALING)

      OP_CODE_MAPPING(SET_MWS_TRANSPORT_LAYER)

      OP_CODE_MAPPING(SET_MWS_SCAN_FREQUENCY_TABLE)

      OP_CODE_MAPPING(SET_MWS_PATTERN_CONFIGURATION)

      OP_CODE_MAPPING(SET_RESERVED_LT_ADDR)

      OP_CODE_MAPPING(DELETE_RESERVED_LT_ADDR)

      OP_CODE_MAPPING(SET_CONNECTIONLESS_PERIPHERAL_BROADCAST_DATA)

      OP_CODE_MAPPING(READ_SYNCHRONIZATION_TRAIN_PARAMETERS)

      OP_CODE_MAPPING(WRITE_SYNCHRONIZATION_TRAIN_PARAMETERS)

      OP_CODE_MAPPING(READ_SECURE_CONNECTIONS_HOST_SUPPORT)

      OP_CODE_MAPPING(WRITE_SECURE_CONNECTIONS_HOST_SUPPORT)

      OP_CODE_MAPPING(READ_AUTHENTICATED_PAYLOAD_TIMEOUT)

      OP_CODE_MAPPING(WRITE_AUTHENTICATED_PAYLOAD_TIMEOUT)

      OP_CODE_MAPPING(READ_LOCAL_OOB_EXTENDED_DATA)

      OP_CODE_MAPPING(READ_EXTENDED_PAGE_TIMEOUT)

      OP_CODE_MAPPING(WRITE_EXTENDED_PAGE_TIMEOUT)

      OP_CODE_MAPPING(READ_EXTENDED_INQUIRY_LENGTH)

      OP_CODE_MAPPING(WRITE_EXTENDED_INQUIRY_LENGTH)

      OP_CODE_MAPPING(SET_ECOSYSTEM_BASE_INTERVAL)

      OP_CODE_MAPPING(CONFIGURE_DATA_PATH)

      OP_CODE_MAPPING(SET_MIN_ENCRYPTION_KEY_SIZE)

      OP_CODE_MAPPING(READ_LOCAL_VERSION_INFORMATION)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_FEATURES)

      OP_CODE_MAPPING(READ_LOCAL_EXTENDED_FEATURES)

      OP_CODE_MAPPING(READ_BUFFER_SIZE)

      OP_CODE_MAPPING(READ_BD_ADDR)

      OP_CODE_MAPPING(READ_DATA_BLOCK_SIZE)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CODECS_V1)

      OP_CODE_MAPPING(READ_LOCAL_SIMPLE_PAIRING_OPTIONS)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CODECS_V2)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CODEC_CAPABILITIES)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CONTROLLER_DELAY)

      OP_CODE_MAPPING(READ_FAILED_CONTACT_COUNTER)

      OP_CODE_MAPPING(RESET_FAILED_CONTACT_COUNTER)

      OP_CODE_MAPPING(READ_LINK_QUALITY)

      OP_CODE_MAPPING(READ_RSSI)

      OP_CODE_MAPPING(READ_AFH_CHANNEL_MAP)

      OP_CODE_MAPPING(READ_CLOCK)

      OP_CODE_MAPPING(READ_ENCRYPTION_KEY_SIZE)

      OP_CODE_MAPPING(GET_MWS_TRANSPORT_LAYER_CONFIGURATION)

      OP_CODE_MAPPING(SET_TRIGGERED_CLOCK_CAPTURE)

      OP_CODE_MAPPING(READ_LOOPBACK_MODE)

      OP_CODE_MAPPING(WRITE_LOOPBACK_MODE)

      OP_CODE_MAPPING(ENABLE_DEVICE_UNDER_TEST_MODE)

      OP_CODE_MAPPING(SETUP_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(ACCEPT_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(REJECT_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(READ_EXTENDED_INQUIRY_RESPONSE)

      OP_CODE_MAPPING(WRITE_EXTENDED_INQUIRY_RESPONSE)

      OP_CODE_MAPPING(REFRESH_ENCRYPTION_KEY)

      OP_CODE_MAPPING(SNIFF_SUBRATING)

      OP_CODE_MAPPING(READ_SIMPLE_PAIRING_MODE)

      OP_CODE_MAPPING(WRITE_SIMPLE_PAIRING_MODE)

      OP_CODE_MAPPING(READ_LOCAL_OOB_DATA)

      OP_CODE_MAPPING(READ_INQUIRY_RESPONSE_TRANSMIT_POWER_LEVEL)

      OP_CODE_MAPPING(WRITE_INQUIRY_TRANSMIT_POWER_LEVEL)

      OP_CODE_MAPPING(IO_CAPABILITY_REQUEST_REPLY)

      OP_CODE_MAPPING(USER_CONFIRMATION_REQUEST_REPLY)

      OP_CODE_MAPPING(USER_CONFIRMATION_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(USER_PASSKEY_REQUEST_REPLY)

      OP_CODE_MAPPING(USER_PASSKEY_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(REMOTE_OOB_DATA_REQUEST_REPLY)

      OP_CODE_MAPPING(WRITE_SIMPLE_PAIRING_DEBUG_MODE)

      OP_CODE_MAPPING(REMOTE_OOB_DATA_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(SEND_KEYPRESS_NOTIFICATION)

      OP_CODE_MAPPING(SET_EVENT_MASK_PAGE_2)

      OP_CODE_MAPPING(IO_CAPABILITY_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(REMOTE_OOB_EXTENDED_DATA_REQUEST_REPLY)

      OP_CODE_MAPPING(READ_ENCRYPTION_KEY_SIZE)

      OP_CODE_MAPPING(READ_DATA_BLOCK_SIZE)

      OP_CODE_MAPPING(READ_LE_HOST_SUPPORT)

      OP_CODE_MAPPING(WRITE_LE_HOST_SUPPORT)

      OP_CODE_MAPPING(WRITE_SECURE_CONNECTIONS_TEST_MODE)

      OP_CODE_MAPPING(LE_SET_EVENT_MASK)

      OP_CODE_MAPPING(LE_READ_BUFFER_SIZE_V1)

      OP_CODE_MAPPING(LE_READ_LOCAL_SUPPORTED_FEATURES)
@@ -798,23 +843,16 @@ struct Controller::impl { 
      OP_CODE_MAPPING(LE_LONG_TERM_KEY_REQUEST_REPLY)

      OP_CODE_MAPPING(LE_LONG_TERM_KEY_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(LE_READ_SUPPORTED_STATES)

      OP_CODE_MAPPING(LE_RECEIVER_TEST)

      OP_CODE_MAPPING(LE_TRANSMITTER_TEST)

      OP_CODE_MAPPING(LE_RECEIVER_TEST_V1)

      OP_CODE_MAPPING(LE_TRANSMITTER_TEST_V1)

      OP_CODE_MAPPING(LE_TEST_END)

      OP_CODE_MAPPING(ENHANCED_SETUP_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(ENHANCED_ACCEPT_SYNCHRONOUS_CONNECTION)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CODECS_V1)

      OP_CODE_MAPPING(READ_SECURE_CONNECTIONS_HOST_SUPPORT)

      OP_CODE_MAPPING(WRITE_SECURE_CONNECTIONS_HOST_SUPPORT)

      OP_CODE_MAPPING(READ_LOCAL_OOB_EXTENDED_DATA)

      OP_CODE_MAPPING(WRITE_SECURE_CONNECTIONS_TEST_MODE)

      OP_CODE_MAPPING(LE_REMOTE_CONNECTION_PARAMETER_REQUEST_REPLY)

      OP_CODE_MAPPING(LE_REMOTE_CONNECTION_PARAMETER_REQUEST_NEGATIVE_REPLY)

      OP_CODE_MAPPING(LE_SET_DATA_LENGTH)

      OP_CODE_MAPPING(LE_READ_SUGGESTED_DEFAULT_DATA_LENGTH)

      OP_CODE_MAPPING(LE_WRITE_SUGGESTED_DEFAULT_DATA_LENGTH)

      OP_CODE_MAPPING(LE_READ_LOCAL_P_256_PUBLIC_KEY_COMMAND)

      OP_CODE_MAPPING(LE_GENERATE_DHKEY_COMMAND_V1)

      OP_CODE_MAPPING(LE_READ_LOCAL_P_256_PUBLIC_KEY)

      OP_CODE_MAPPING(LE_GENERATE_DHKEY_V1)

      OP_CODE_MAPPING(LE_ADD_DEVICE_TO_RESOLVING_LIST)

      OP_CODE_MAPPING(LE_REMOVE_DEVICE_FROM_RESOLVING_LIST)

      OP_CODE_MAPPING(LE_CLEAR_RESOLVING_LIST)
@@ -827,8 +865,8 @@ struct Controller::impl { 
      OP_CODE_MAPPING(LE_READ_PHY)

      OP_CODE_MAPPING(LE_SET_DEFAULT_PHY)

      OP_CODE_MAPPING(LE_SET_PHY)

      OP_CODE_MAPPING(LE_ENHANCED_RECEIVER_TEST)

      OP_CODE_MAPPING(LE_ENHANCED_TRANSMITTER_TEST)

      OP_CODE_MAPPING(LE_RECEIVER_TEST_V2)

      OP_CODE_MAPPING(LE_TRANSMITTER_TEST_V2)

      OP_CODE_MAPPING(LE_SET_ADVERTISING_SET_RANDOM_ADDRESS)

      OP_CODE_MAPPING(LE_SET_EXTENDED_ADVERTISING_PARAMETERS)

      OP_CODE_MAPPING(LE_SET_EXTENDED_ADVERTISING_DATA)
@@ -855,12 +893,22 @@ struct Controller::impl { 
      OP_CODE_MAPPING(LE_READ_RF_PATH_COMPENSATION_POWER)

      OP_CODE_MAPPING(LE_WRITE_RF_PATH_COMPENSATION_POWER)

      OP_CODE_MAPPING(LE_SET_PRIVACY_MODE)

      OP_CODE_MAPPING(LE_RECEIVER_TEST_V3)

      OP_CODE_MAPPING(LE_TRANSMITTER_TEST_V3)

      OP_CODE_MAPPING(LE_SET_CONNECTIONLESS_CTE_TRANSMIT_PARAMETERS)

      OP_CODE_MAPPING(LE_SET_CONNECTIONLESS_CTE_TRANSMIT_ENABLE)

      OP_CODE_MAPPING(LE_SET_CONNECTIONLESS_IQ_SAMPLING_ENABLE)

      OP_CODE_MAPPING(LE_SET_CONNECTION_CTE_RECEIVE_PARAMETERS)

      OP_CODE_MAPPING(LE_SET_CONNECTION_CTE_TRANSMIT_PARAMETERS)

      OP_CODE_MAPPING(LE_CONNECTION_CTE_REQUEST_ENABLE)

      OP_CODE_MAPPING(LE_CONNECTION_CTE_RESPONSE_ENABLE)

      OP_CODE_MAPPING(LE_READ_ANTENNA_INFORMATION)

      OP_CODE_MAPPING(LE_SET_PERIODIC_ADVERTISING_RECEIVE_ENABLE)

      OP_CODE_MAPPING(LE_PERIODIC_ADVERTISING_SYNC_TRANSFER)

      OP_CODE_MAPPING(LE_PERIODIC_ADVERTISING_SET_INFO_TRANSFER)

      OP_CODE_MAPPING(LE_SET_PERIODIC_ADVERTISING_SYNC_TRANSFER_PARAMETERS)

      OP_CODE_MAPPING(LE_SET_DEFAULT_PERIODIC_ADVERTISING_SYNC_TRANSFER_PARAMETERS)

      OP_CODE_MAPPING(LE_GENERATE_DHKEY_COMMAND)

      OP_CODE_MAPPING(LE_GENERATE_DHKEY_V2)

      OP_CODE_MAPPING(LE_MODIFY_SLEEP_CLOCK_ACCURACY)

      OP_CODE_MAPPING(LE_READ_BUFFER_SIZE_V2)

      OP_CODE_MAPPING(LE_READ_ISO_TX_SYNC)
@@ -871,12 +919,17 @@ struct Controller::impl { 
      OP_CODE_MAPPING(LE_ACCEPT_CIS_REQUEST)

      OP_CODE_MAPPING(LE_REJECT_CIS_REQUEST)

      OP_CODE_MAPPING(LE_CREATE_BIG)

      OP_CODE_MAPPING(LE_CREATE_BIG_TEST)

      OP_CODE_MAPPING(LE_TERMINATE_BIG)

      OP_CODE_MAPPING(LE_BIG_CREATE_SYNC)

      OP_CODE_MAPPING(LE_BIG_TERMINATE_SYNC)

      OP_CODE_MAPPING(LE_REQUEST_PEER_SCA)

      OP_CODE_MAPPING(LE_SETUP_ISO_DATA_PATH)

      OP_CODE_MAPPING(LE_REMOVE_ISO_DATA_PATH)

      OP_CODE_MAPPING(LE_ISO_TRANSMIT_TEST)

      OP_CODE_MAPPING(LE_ISO_RECEIVE_TEST)

      OP_CODE_MAPPING(LE_ISO_READ_TEST_COUNTERS)

      OP_CODE_MAPPING(LE_ISO_TEST_END)

      OP_CODE_MAPPING(LE_SET_HOST_FEATURE)

      OP_CODE_MAPPING(LE_READ_ISO_LINK_QUALITY)

      OP_CODE_MAPPING(LE_ENHANCED_READ_TRANSMIT_POWER_LEVEL)
@@ -884,16 +937,10 @@ struct Controller::impl { 
      OP_CODE_MAPPING(LE_SET_PATH_LOSS_REPORTING_PARAMETERS)

      OP_CODE_MAPPING(LE_SET_PATH_LOSS_REPORTING_ENABLE)

      OP_CODE_MAPPING(LE_SET_TRANSMIT_POWER_REPORTING_ENABLE)

      OP_CODE_MAPPING(SET_ECOSYSTEM_BASE_INTERVAL)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CODECS_V2)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CODEC_CAPABILITIES)

      OP_CODE_MAPPING(READ_LOCAL_SUPPORTED_CONTROLLER_DELAY)

      OP_CODE_MAPPING(CONFIGURE_DATA_PATH)

      OP_CODE_MAPPING(ENHANCED_FLUSH)

      OP_CODE_MAPPING(LE_TRANSMITTER_TEST_V4)

      OP_CODE_MAPPING(LE_SET_DATA_RELATED_ADDRESS_CHANGES)

      OP_CODE_MAPPING(LE_SET_DEFAULT_SUBRATE)

      OP_CODE_MAPPING(LE_SUBRATE_REQUEST)

      OP_CODE_MAPPING(SET_MIN_ENCRYPTION_KEY_SIZE)



      // deprecated

      case OpCode::ADD_SCO_CONNECTION: