| Message ID | 20201113113956.52187-1-wanghai38@huawei.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] Bluetooth: Fix potential null pointer dereference in create_le_conn_complete | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 17 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
Hi Wang, > The pointer 'conn' may be null. Before being used by > hci_connect_le_scan_cleanup(), The pointer 'conn' must be > checked whether it is null. > > Fixes: 28a667c9c279 ("Bluetooth: advertisement handling in new connect procedure") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Wang Hai <wanghai38@huawei.com> > --- > net/bluetooth/hci_conn.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) please send a version that applies cleanly against bluetooth-next tree. Regards Marcel
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index d0c1024bf600..6ca402c90ee1 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -757,6 +757,8 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode) hci_dev_lock(hdev); conn = hci_lookup_le_connect(hdev); + if (!conn) + goto done; if (!status) { hci_connect_le_scan_cleanup(conn); @@ -766,9 +768,6 @@ static void create_le_conn_complete(struct hci_dev *hdev, u8 status, u16 opcode) bt_dev_err(hdev, "request failed to create LE connection: " "status 0x%2.2x", status); - if (!conn) - goto done; - hci_le_conn_failed(conn, status); done:
The pointer 'conn' may be null. Before being used by hci_connect_le_scan_cleanup(), The pointer 'conn' must be checked whether it is null. Fixes: 28a667c9c279 ("Bluetooth: advertisement handling in new connect procedure") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Wang Hai <wanghai38@huawei.com> --- net/bluetooth/hci_conn.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)