summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2016-08-15 15:02:20 +0200
committerMarcel Holtmann <marcel@holtmann.org>2016-08-25 20:58:47 +0200
commit4f34228b67246ae3b3ab1dc33b980c77c0650ef4 (patch)
treeb644046272d04e166febcc1870eb8f05cc9cd6d0 /net
parentBluetooth: Fix bt_sock_recvmsg when MSG_TRUNC is not set (diff)
downloadlinux-4f34228b67246ae3b3ab1dc33b980c77c0650ef4.tar.xz
linux-4f34228b67246ae3b3ab1dc33b980c77c0650ef4.zip
Bluetooth: Fix hci_sock_recvmsg when MSG_TRUNC is not set
Similar to bt_sock_recvmsg MSG_TRUNC shall be checked using the original flags not msg_flags. Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/hci_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 6ef8a01a9ad4..96f04b7b9556 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -1091,7 +1091,7 @@ static int hci_sock_recvmsg(struct socket *sock, struct msghdr *msg,
skb_free_datagram(sk, skb);
- if (msg->msg_flags & MSG_TRUNC)
+ if (flags & MSG_TRUNC)
copied = skblen;
return err ? : copied;