bluetooth: fix uninitialized variables notify_evt
Subsystems (2)
PATCH v2 1/1 bluetooth: fix uninitialized variables notify_evt
From: Jackie Liu <[email protected]>
Coverity Scan report:
[...]
*** CID 1493985: Uninitialized variables (UNINIT) /net/bluetooth/hci_event.c: 4535 in hci_sync_conn_complete_evt() 4529
4530 /* Notify only in case of SCO over HCI transport data path which
4531 * is zero and non-zero value shall be non-HCI transport data path
4532 */
4533 if (conn->codec.data_path == 0) {
4534 if (hdev->notify)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
CID 1493985: Uninitialized variables (UNINIT)
Using uninitialized value "notify_evt" when calling "*hdev->notify".
4535 hdev->notify(hdev, notify_evt);
4536 }
4537
4538 hci_connect_cfm(conn, ev->status); 4539 if (ev->status) 4540 hci_conn_del(conn);
[...]
Although only btusb uses air_mode, and he only handles HCI_NOTIFY_ENABLE_SCO_CVSD and HCI_NOTIFY_ENABLE_SCO_TRANSP, there is still a very small chance that ev->air_mode is not equal to 0x2 and 0x3, but notify_evt is initialized to HCI_NOTIFY_ENABLE_SCO_CVSD or HCI_NOTIFY_ENABLE_SCO_TRANSP. the context is maybe not correct.
Let us directly use the required function instead of re-initializing it, so as to restore the original logic and make the code more correct.
Addresses-Coverity: ("Uninitialized variables")
--- net/bluetooth/hci_event.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
net/bluetooth/hci_event.c +9 -14
@@ -4445,7 +4445,6 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, {struct hci_ev_sync_conn_complete *ev = (void *) skb->data;struct hci_conn *conn; -unsigned int notify_evt;BT_DBG ("%s status 0x%2.2x" , hdev->name, ev->status);
@@ -4517,22 +4516,18 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, }bt_dev_dbg (hdev,"SCO connected with air mode: %02x" , ev->air_mode); - -switch (ev->air_mode) { -case 0x02 : - notify_evt =HCI_NOTIFY_ENABLE_SCO_CVSD ; -break ; -case 0x03 : - notify_evt =HCI_NOTIFY_ENABLE_SCO_TRANSP ; -break ; - } -/* Notify only in case of SCO over HCI transport data path which * is zero and non-zero value shall be non-HCI transport data path */ -if (conn->codec.data_path ==0 ) { -if (hdev->notify) - hdev->notify (hdev, notify_evt); +if (conn->codec.data_path ==0 && hdev->notify) { +switch (ev->air_mode) { +case 0x02 : + hdev->notify (hdev,HCI_NOTIFY_ENABLE_SCO_CVSD ); +break ; +case 0x03 : + hdev->notify (hdev,HCI_NOTIFY_ENABLE_SCO_TRANSP ); +break ; + } }hci_connect_cfm (conn, ev->status);
Signature · 1 line
2.25.1
Marcel Holtmann
maintainerHi Jackie,
Quoted 30 lines
Coverity Scan report:
[...]
*** CID 1493985: Uninitialized variables (UNINIT) /net/bluetooth/hci_event.c: 4535 inhci_sync_conn_complete_evt()45294530 /* Notify only in case of SCO over HCI transport data path which 4531 * is zero and non-zero value shall be non-HCI transport data path 4532 */ 4533 if (conn->codec.data_path == 0) { 4534 if (hdev->notify)Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
CID 1493985: Uninitialized variables (UNINIT)
Using uninitialized value "notify_evt" when calling "*hdev->notify".4535
hdev->notify(hdev, notify_evt);
4536 }
45374538 hci_connect_cfm(conn, ev->status); 4539 if (ev->status) 4540 hci_conn_del(conn);[...]
Although only btusb uses
air_mode, and he only handlesHCI_NOTIFY_ENABLE_SCO_CVSDandHCI_NOTIFY_ENABLE_SCO_TRANSP, there is still a very small chance thatev->air_modeis not equal to0x2and0x3, butnotify_evtis initialized toHCI_NOTIFY_ENABLE_SCO_CVSDorHCI_NOTIFY_ENABLE_SCO_TRANSP. the context is maybe not correct.Let us directly use the required function instead of re-initializing it, so as to restore the original logic and make the code more correct.
Quoted 7 lines
Addresses-Coverity: ("Uninitialized variables")
Fixes f4f9fa0c07bb ("Bluetooth: Allow usb to auto-suspend when SCO use non-HCI transport")Suggested-by Marcel Holtmann <[email protected]>Signed-off-by Jackie Liu <[email protected]>---
net/bluetooth/hci_event.c| 23 +++++++++--------------1 file changed, 9 insertions(+), 14 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel