| Message ID | tencent_E60894D8E85AEEF2CD9C787A6CA82F656C0A@qq.com |
|---|---|
| State | Accepted |
| Commit | 693a94db9e8cff14cce892cba6818bc67ab51ec4 |
| Headers | show |
| Series | [next] bluetooth/btintel: fix null ptr deref in btintel_read_version | expand |
Hello: This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Thu, 18 Jan 2024 12:40:34 +0800 you wrote: > If hci_cmd_sync_complete() is triggered and skb is NULL, then hdev->req_skb is NULL, > which will cause this issue. > > Reported-and-tested-by: syzbot+830d9e3fa61968246abd@syzkaller.appspotmail.com > Signed-off-by: Edward Adam Davis <eadavis@qq.com> > --- > drivers/bluetooth/btintel.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - [next] bluetooth/btintel: fix null ptr deref in btintel_read_version https://git.kernel.org/bluetooth/bluetooth-next/c/693a94db9e8c You are awesome, thank you!
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index cdc5c08824a0..e5b043d96207 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -435,7 +435,7 @@ int btintel_read_version(struct hci_dev *hdev, struct intel_version *ver) struct sk_buff *skb; skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_CMD_TIMEOUT); - if (IS_ERR(skb)) { + if (IS_ERR_OR_NULL(skb)) { bt_dev_err(hdev, "Reading Intel version information failed (%ld)", PTR_ERR(skb)); return PTR_ERR(skb);
If hci_cmd_sync_complete() is triggered and skb is NULL, then hdev->req_skb is NULL, which will cause this issue. Reported-and-tested-by: syzbot+830d9e3fa61968246abd@syzkaller.appspotmail.com Signed-off-by: Edward Adam Davis <eadavis@qq.com> --- drivers/bluetooth/btintel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)