Commit 1fb35485 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Wupeng Ma
Browse files

Bluetooth: Fix memory leak in hci_req_sync_complete() 

stable inclusion
from stable-v5.10.216
commit 8478394f76c748862ef179a16f651f752bdafaf0
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9QRBX
CVE: CVE-2024-35978

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=8478394f76c748862ef179a16f651f752bdafaf0



--------------------------------

commit 45d355a926ab40f3ae7bc0b0a00cb0e3e8a5a810 upstream.

In 'hci_req_sync_complete()', always free the previous sync
request state before assigning reference to a new one.

Reported-by: default avatar <syzbot+39ec16ff6cc18b1d066d@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=39ec16ff6cc18b1d066d


Cc: stable@vger.kernel.org
Fixes: f60cb305 ("Bluetooth: Convert hci_req_sync family of function to new request API")
Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
parent 3b9084bc

net/bluetooth/hci_request.c

+3 −1
Original line number Diff line number Diff line
@@ -107,8 +107,10 @@ static void hci_req_sync_complete(struct hci_dev *hdev, u8 result, u16 opcode, 
	if (hdev->req_status == HCI_REQ_PEND) {

		hdev->req_result = result;

		hdev->req_status = HCI_REQ_DONE;

		if (skb)

		if (skb) {

			kfree_skb(hdev->req_skb);

			hdev->req_skb = skb_get(skb);

		}

		wake_up_interruptible(&hdev->req_wait_q);

	}

}