[PATCH] BLUETOOTH: Fix unaligned access in hci_send_to_sock.
authorDavid S. Miller <davem@davemloft.net>
Wed, 22 Nov 2006 02:59:08 +0000 (02:59 +0000)
committerChris Wright <chrisw@sous-sol.org>
Sat, 2 Dec 2006 00:12:37 +0000 (16:12 -0800)
The "u16 *" derefs of skb->data need to be wrapped inside of
a get_unaligned().

Thanks to Gustavo Zacarias for the bug report.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
net/bluetooth/hci_sock.c

index 1a35d343e08a593f91cc71fce52306a50d991c4b..316fa7a3e233e866a9a26241c182550cab2d55d4 100644 (file)
@@ -120,10 +120,13 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb)
                        if (!hci_test_bit(evt, &flt->event_mask))
                                continue;
 
-                       if (flt->opcode && ((evt == HCI_EV_CMD_COMPLETE && 
-                                       flt->opcode != *(__u16 *)(skb->data + 3)) ||
-                                       (evt == HCI_EV_CMD_STATUS && 
-                                       flt->opcode != *(__u16 *)(skb->data + 4))))
+                       if (flt->opcode &&
+                           ((evt == HCI_EV_CMD_COMPLETE &&
+                             flt->opcode !=
+                             get_unaligned((__u16 *)(skb->data + 3))) ||
+                            (evt == HCI_EV_CMD_STATUS &&
+                             flt->opcode !=
+                             get_unaligned((__u16 *)(skb->data + 4)))))
                                continue;
                }