Commit 48c7aba9 authored Feb 19, 2012 by Johan Hedberg

Bluetooth: Fix hci_connect error return values



The hci_connect function should either return a valid hci_conn pointer
or a ERR_PTR() but never NULL. This patch fixes the two places where
hci_conn_add failures would have caused a NULL return. The only reason
for failure with hci_conn_add is memory allocation so ENOMEM seems to be
a good choice here.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

parent 2da9c55c

net/bluetooth/hci_conn.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@ struct hci_conn hci_connect(struct hci_dev hdev, int type, bdaddr_t *dst, __u8
		if (!acl) {
		acl = hci_conn_add(hdev, ACL_LINK, dst);
		if (!acl)
		return NULL;
		return ERR_PTR(-ENOMEM);
		}

		hci_conn_hold(acl);
		@@ -571,7 +571,7 @@ struct hci_conn hci_connect(struct hci_dev hdev, int type, bdaddr_t *dst, __u8
		sco = hci_conn_add(hdev, type, dst);
		if (!sco) {
		hci_conn_put(acl);
		return NULL;
		return ERR_PTR(-ENOMEM);
		}
		}