lkml.org 
[lkml]   [2024]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 6.1 30/31] Bluetooth: btintel: Fix null ptr deref in btintel_read_version
    Date
    From: Edward Adam Davis <eadavis@qq.com>

    [ 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>
    ---
    drivers/bluetooth/btintel.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
    index bbad1207cdfd8..c77c06b84d86c 100644
    --- a/drivers/bluetooth/btintel.c
    +++ b/drivers/bluetooth/btintel.c
    @@ -405,7 +405,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);
    --
    2.43.0

    \
     
     \ /
      Last update: 2024-05-27 16:15    [W:4.079 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site