]> git.baikalelectronics.ru Git - kernel.git/commit
Bluetooth: fix uninitialized variables notify_evt
authorJackie Liu <liuyun01@kylinos.cn>
Tue, 16 Nov 2021 01:17:17 +0000 (09:17 +0800)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 16 Nov 2021 13:01:30 +0000 (14:01 +0100)
commitaf10acd8a4f7ffc56af96639f54bbe586d9116d8
tree7ff5b6811555dc54bc09a9747f4e735d825375e4
parenta291317ab3f8fd053eeba6aabb37089516fd47f4
Bluetooth: fix uninitialized variables notify_evt

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)
>>>     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")
Fixes: aaba6aa6dcc9 ("Bluetooth: Allow usb to auto-suspend when SCO use non-HCI transport")
Suggested-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
net/bluetooth/hci_event.c