Commit ab89f0bd authored Apr 24, 2017 by Szymon Janc Committed by Marcel Holtmann Apr 30, 2017

Bluetooth: Fix user channel for 32bit userspace on 64bit kernel



Running 32bit userspace on 64bit kernel results in MSG_CMSG_COMPAT being
defined as 0x80000000. This results in sendmsg failure if used from 32bit
userspace running on 64bit kernel. Fix this by accounting for MSG_CMSG_COMPAT
in flags check in hci_sock_sendmsg.

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
Signed-off-by: Marko Kiiskila <marko@runtime.io>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: stable@vger.kernel.org

parent 763d9a30

net/bluetooth/hci_sock.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1680,7 +1680,8 @@ static int hci_sock_sendmsg(struct socket sock, struct msghdr msg,
	if (msg->msg_flags & MSG_OOB)		if (msg->msg_flags & MSG_OOB)
	return -EOPNOTSUPP;		return -EOPNOTSUPP;

	if (msg->msg_flags & ~(MSG_DONTWAIT\|MSG_NOSIGNAL\|MSG_ERRQUEUE))		if (msg->msg_flags & ~(MSG_DONTWAIT\|MSG_NOSIGNAL\|MSG_ERRQUEUE\|
			MSG_CMSG_COMPAT))
	return -EINVAL;		return -EINVAL;

	if (len < 4 \|\| len > HCI_MAX_FRAME_SIZE)		if (len < 4 \|\| len > HCI_MAX_FRAME_SIZE)

Admin message