Commit 954393f1 authored Apr 16, 2023 by Ruihan Li Committed by sanglipeng Nov 20, 2023

bluetooth: Add cmd validity checks at the start of hci_sock_ioctl()

stable inclusion
from stable-v5.10.182
commit e4d2e6c3054b974125bdae74ee57017964232c4a
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8GJZJ

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



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

commit 000c2fa2 upstream.

Previously, channel open messages were always sent to monitors on the first
ioctl() call for unbound HCI sockets, even if the command and arguments
were completely invalid. This can leave an exploitable hole with the abuse
of invalid ioctl calls.

This commit hardens the ioctl processing logic by first checking if the
command is valid, and immediately returning with an ENOIOCTLCMD error code
if it is not. This ensures that ioctl calls with invalid commands are free
of side effects, and increases the difficulty of further exploitation by
forcing exploitation to find a way to pass a valid command first.

Signed-off-by: Ruihan Li <lrh2000@pku.edu.cn>
Co-developed-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Dragos-Marian Panait <dragos.panait@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent b8d861e6

net/bluetooth/hci_sock.c

+28 −0

Original line number	Diff line number	Diff line
		@@ -980,6 +980,34 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd,

		BT_DBG("cmd %x arg %lx", cmd, arg);

		/* Make sure the cmd is valid before doing anything */
		switch (cmd) {
		case HCIGETDEVLIST:
		case HCIGETDEVINFO:
		case HCIGETCONNLIST:
		case HCIDEVUP:
		case HCIDEVDOWN:
		case HCIDEVRESET:
		case HCIDEVRESTAT:
		case HCISETSCAN:
		case HCISETAUTH:
		case HCISETENCRYPT:
		case HCISETPTYPE:
		case HCISETLINKPOL:
		case HCISETLINKMODE:
		case HCISETACLMTU:
		case HCISETSCOMTU:
		case HCIINQUIRY:
		case HCISETRAW:
		case HCIGETCONNINFO:
		case HCIGETAUTHINFO:
		case HCIBLOCKADDR:
		case HCIUNBLOCKADDR:
		break;
		default:
		return -ENOIOCTLCMD;
		}

		lock_sock(sk);

		if (hci_pi(sk)->channel != HCI_CHANNEL_RAW) {