| From ab89f0bdd63a3721f7cd3f064f39fc4ac7ca14d4 Mon Sep 17 00:00:00 2001 |
| From: Szymon Janc <szymon.janc@codecoup.pl> |
| Date: Mon, 24 Apr 2017 18:25:04 -0700 |
| Subject: [PATCH] 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> |
| Cc: stable@vger.kernel.org |
| |
| diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c |
| index f64d6566021f..638bf0e1a2e3 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, |
| 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) |
| -- |
| 2.12.0 |
| |