summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBrian Gix <bgix@codeaurora.org>2012-03-09 23:07:03 +0100
committerGustavo Padovan <gustavo@padovan.org>2012-03-28 20:06:09 +0200
commit531563850b29726bf37a81e877277902881ab77e (patch)
treebbec7c1432d65063262513003e6231327d91651e /net
parentBluetooth: Add support for Atheros [04ca:3005] (diff)
downloadlinux-531563850b29726bf37a81e877277902881ab77e.tar.xz
linux-531563850b29726bf37a81e877277902881ab77e.zip
Bluetooth: mgmt: Fix corruption of device_connected pkt
Incorrect pointer passed to eir_append_data made mgmt_device_connected event unparsable by mgmt user space entity. Signed-off-by: Brian Gix <bgix@codeaurora.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 7fcff8887131..0e169dacfd4f 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -2936,7 +2936,7 @@ int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
name, name_len);
if (dev_class && memcmp(dev_class, "\0\0\0", 3) != 0)
- eir_len = eir_append_data(&ev->eir[eir_len], eir_len,
+ eir_len = eir_append_data(ev->eir, eir_len,
EIR_CLASS_OF_DEV, dev_class, 3);
put_unaligned_le16(eir_len, &ev->eir_len);