diff options
| author | Ram Malovany <ramm@ti.com> | 2012-07-19 09:26:09 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-08-06 20:19:36 +0200 |
| commit | c810089c27e48b816181b454fcc493d19fdbc2ba (patch) | |
| tree | 1784672bacd60890f7e8d348a1b40a4a68d0a63c /net/bluetooth | |
| parent | Bluetooth: Fix legacy pairing with some devices (diff) | |
| download | linux-c810089c27e48b816181b454fcc493d19fdbc2ba.tar.xz linux-c810089c27e48b816181b454fcc493d19fdbc2ba.zip | |
Bluetooth: Fix using NULL inquiry entry
If entry wasn't found in the hci_inquiry_cache_lookup_resolve do not
resolve the name.This will fix a kernel crash when trying to use NULL
pointer.
Cc: stable@vger.kernel.org
Signed-off-by: Ram Malovany <ramm@ti.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 248632cec11d..b64cfa213bd6 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1365,6 +1365,9 @@ static bool hci_resolve_next_name(struct hci_dev *hdev) return false; e = hci_inquiry_cache_lookup_resolve(hdev, BDADDR_ANY, NAME_NEEDED); + if (!e) + return false; + if (hci_resolve_name(hdev, e) == 0) { e->name_state = NAME_PENDING; return true; |