diff options
| author | Szymon Janc <szymon.janc@codecoup.pl> | 2017-04-24 18:25:04 -0700 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-05-17 15:08:24 -0400 |
| commit | 9575253a91e6fb3cb88ba95e7802c6b0aa215c7e (patch) | |
| tree | 123956ec94a3378d86b51a2fd9ac01e2cd888a67 | |
| parent | ca38d087f1b0f8d2478fbe3da455f03bf3f69ee4 (diff) | |
| download | linux-stable-9575253a91e6fb3cb88ba95e7802c6b0aa215c7e.tar.gz linux-stable-9575253a91e6fb3cb88ba95e7802c6b0aa215c7e.tar.bz2 linux-stable-9575253a91e6fb3cb88ba95e7802c6b0aa215c7e.zip | |
Bluetooth: Fix user channel for 32bit userspace on 64bit kernel
[ Upstream commit ab89f0bdd63a3721f7cd3f064f39fc4ac7ca14d4 ]
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
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -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 e11a5cfda4b1..e3309985944c 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -1091,7 +1091,8 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg, if (msg->msg_flags & MSG_OOB) 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; if (len < 4 || len > HCI_MAX_FRAME_SIZE) |