Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52204af authored by Pavel Skripkin's avatar Pavel Skripkin Committed by Greg Kroah-Hartman
Browse files

Bluetooth: add timeout sanity check to hci_inquiry 



[ Upstream commit f41a4b2b5eb7872109723dab8ae1603bdd9d9ec1 ]

Syzbot hit "task hung" bug in hci_req_sync(). The problem was in
unreasonable huge inquiry timeout passed from userspace.
Fix it by adding sanity check for timeout value to hci_inquiry().

Since hci_inquiry() is the only user of hci_req_sync() with user
controlled timeout value, it makes sense to check timeout value in
hci_inquiry() and don't touch hci_req_sync().

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Reported-and-tested-by: default avatar <syzbot+be2baed593ea56c6a84c@syzkaller.appspotmail.com>
Signed-off-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 21c82201

net/bluetooth/hci_core.c

+6 −0
Original line number Diff line number Diff line
@@ -1296,6 +1296,12 @@ int hci_inquiry(void __user *arg) 
		goto done;

	}



	/* Restrict maximum inquiry length to 60 seconds */

	if (ir.length > 60) {

		err = -EINVAL;

		goto done;

	}



	hci_dev_lock(hdev);

	if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX ||

	    inquiry_cache_empty(hdev) || ir.flags & IREQ_CACHE_FLUSH) {