diff options
| author | David S. Miller <davem@davemloft.net> | 2017-05-01 20:34:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-05-01 20:34:46 +0200 |
| commit | f9ed236c2aed30eef4b2c8025973631714655301 (patch) | |
| tree | 649a50975caa3c26c42f42eebbd3158c7e3d3f23 /net/bluetooth/hci_sock.c | |
| parent | switchdev: documentation: fix whitespace issues (diff) | |
| parent | Bluetooth: Add selftest for ECDH key generation (diff) | |
| download | linux-f9ed236c2aed30eef4b2c8025973631714655301.tar.xz linux-f9ed236c2aed30eef4b2c8025973631714655301.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-04-30
Here's one last batch of Bluetooth patches in the bluetooth-next tree
targeting the 4.12 kernel.
- Remove custom ECDH implementation and use new KPP API instead
- Add protocol checks to hci_ldisc
- Add module license to HCI UART Nokia H4+ driver
- Minor fix for 32bit user space - 64 bit kernel combination
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
| -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 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) |