2012-03-09 22:07:03

by Brian Gix

Subject: [PATCH 1/1] Bluetooth: 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 <[email protected]>
---
net/bluetooth/mgmt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 97b5b6c..bcd632d 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);
--
1.7.8.3

2012-03-16 15:29:31

by Johan Hedberg

Subject: Re: [PATCH 1/1] Bluetooth: Fix corruption of device_connected pkt

Hi Brian,

On Fri, Mar 09, 2012, Brian Gix wrote:
> Incorrect pointer passed to eir_append_data made mgmt_device_connected
> event unparsable by mgmt user space entity.
>
> Signed-off-by: Brian Gix <[email protected]>
> ---
> net/bluetooth/mgmt.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)

Applied to my bluetooth-next tree. Thanks.

Johan