diff options
| author | Szymon Janc <szymon.janc@codecoup.pl> | 2017-04-24 21:25:04 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-05-20 08:28:41 -0400 |
| commit | 518ca84479d7b6a12e77327d1914d0de21f45b29 (patch) | |
| tree | 889ae7adf6d509776cd29b80df718fa14da33281 | |
| parent | 89c91ea375816c2a34c4035c7feb40db3f053ae9 (diff) | |
Bluetooth: Fix user channel for 32bit userspace on 64bit kernel
commit ab89f0bdd63a3721f7cd3f064f39fc4ac7ca14d4 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/bluetooth/hci_sock.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 48f9471e7c85..c88a6007e643 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c | |||
| @@ -1680,7 +1680,8 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg, | |||
| 1680 | if (msg->msg_flags & MSG_OOB) | 1680 | if (msg->msg_flags & MSG_OOB) |
| 1681 | return -EOPNOTSUPP; | 1681 | return -EOPNOTSUPP; |
| 1682 | 1682 | ||
| 1683 | if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_NOSIGNAL|MSG_ERRQUEUE)) | 1683 | if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_NOSIGNAL|MSG_ERRQUEUE| |
| 1684 | MSG_CMSG_COMPAT)) | ||
| 1684 | return -EINVAL; | 1685 | return -EINVAL; |
| 1685 | 1686 | ||
| 1686 | if (len < 4 || len > HCI_MAX_FRAME_SIZE) | 1687 | if (len < 4 || len > HCI_MAX_FRAME_SIZE) |