Bluetooth: Check 'dev_class' in mgmt_device_found()
authorAndre Guedes <andre.guedes@openbossa.org>
Fri, 9 Sep 2011 21:56:26 +0000 (18:56 -0300)
committerGustavo F. Padovan <padovan@profusion.mobi>
Wed, 21 Sep 2011 15:59:16 +0000 (12:59 -0300)
The mgmt_device_found event will be used to report LE devices found
during discovery procedure. Since LE advertising reports events
doesn't have class of device information, we need to check if
'dev_class' is not NULL before copying it.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
net/bluetooth/mgmt.c

index 45b7a4e5aa420d742e50b810dab36bc96df00ccd..5a94eec06caa900f9bb422b5cd7376076d67c63d 100644 (file)
@@ -2324,12 +2324,14 @@ int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 *dev_class, s8 rssi,
        memset(&ev, 0, sizeof(ev));
 
        bacpy(&ev.bdaddr, bdaddr);
-       memcpy(ev.dev_class, dev_class, sizeof(ev.dev_class));
        ev.rssi = rssi;
 
        if (eir)
                memcpy(ev.eir, eir, sizeof(ev.eir));
 
+       if (dev_class)
+               memcpy(ev.dev_class, dev_class, sizeof(ev.dev_class));
+
        return mgmt_event(MGMT_EV_DEVICE_FOUND, index, &ev, sizeof(ev), NULL);
 }