diff options
| author | Edward Adam Davis <eadavis@qq.com> | 2024-01-18 12:40:34 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-13 12:51:38 +0200 |
| commit | 68a69bb2ecafaacdb998a87783068fb51736f43b (patch) | |
| tree | c089bcd5685cd44876da4294065bd7c2060063db | |
| parent | 024529c27c8b4b273325a169e078337c8279e229 (diff) | |
| download | linux-stable-68a69bb2ecafaacdb998a87783068fb51736f43b.tar.gz linux-stable-68a69bb2ecafaacdb998a87783068fb51736f43b.tar.bz2 linux-stable-68a69bb2ecafaacdb998a87783068fb51736f43b.zip | |
Bluetooth: btintel: Fix null ptr deref in btintel_read_version
[ Upstream commit b79e040910101b020931ba0c9a6b77e81ab7f645 ]
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>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/bluetooth/btintel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c index bb99c8653aab..5694dd63c145 100644 --- a/drivers/bluetooth/btintel.c +++ b/drivers/bluetooth/btintel.c @@ -340,7 +340,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); |