Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ed93dc6 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: Use %pMR in debug instead of batostr 



Instead of old unsafe batostr function use %pMR print specifier
for printing Bluetooth addresses in debug and error statements.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 36a75f1b

net/bluetooth/bnep/core.c

+1 −2
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ static int bnep_ctrl_set_mcfilter(struct bnep_session *s, u8 *data, int len) 
			a2 = data;

			data += ETH_ALEN;



			BT_DBG("mc filter %s -> %s",

				batostr((void *) a1), batostr((void *) a2));

			BT_DBG("mc filter %pMR -> %pMR", a1, a2);



			/* Iterate from a1 to a2 */

			set_bit(bnep_mc_hash(a1), (ulong *) &s->mc_filter);

net/bluetooth/hci_conn.c

+3 −3
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) 
{

	struct hci_conn *conn;



	BT_DBG("%s dst %s", hdev->name, batostr(dst));

	BT_DBG("%s dst %pMR", hdev->name, dst);



	conn = kzalloc(sizeof(struct hci_conn), GFP_KERNEL);

	if (!conn)
@@ -437,7 +437,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src) 
	int use_src = bacmp(src, BDADDR_ANY);

	struct hci_dev *hdev = NULL, *d;



	BT_DBG("%s -> %s", batostr(src), batostr(dst));

	BT_DBG("%pMR -> %pMR", src, dst);



	read_lock(&hci_dev_list_lock);
@@ -567,7 +567,7 @@ static struct hci_conn *hci_connect_sco(struct hci_dev *hdev, int type, 
struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,

			     __u8 dst_type, __u8 sec_level, __u8 auth_type)

{

	BT_DBG("%s dst %s type 0x%x", hdev->name, batostr(dst), type);

	BT_DBG("%s dst %pMR type 0x%x", hdev->name, dst, type);



	switch (type) {

	case LE_LINK:

net/bluetooth/hci_core.c

+11 −11
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev, 
	struct discovery_state *cache = &hdev->discovery;

	struct inquiry_entry *e;



	BT_DBG("cache %p, %s", cache, batostr(bdaddr));

	BT_DBG("cache %p, %pMR", cache, bdaddr);



	list_for_each_entry(e, &cache->all, all) {

		if (!bacmp(&e->data.bdaddr, bdaddr))
@@ -421,7 +421,7 @@ struct inquiry_entry *hci_inquiry_cache_lookup_unknown(struct hci_dev *hdev, 
	struct discovery_state *cache = &hdev->discovery;

	struct inquiry_entry *e;



	BT_DBG("cache %p, %s", cache, batostr(bdaddr));

	BT_DBG("cache %p, %pMR", cache, bdaddr);



	list_for_each_entry(e, &cache->unknown, list) {

		if (!bacmp(&e->data.bdaddr, bdaddr))
@@ -438,7 +438,7 @@ struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev, 
	struct discovery_state *cache = &hdev->discovery;

	struct inquiry_entry *e;



	BT_DBG("cache %p bdaddr %s state %d", cache, batostr(bdaddr), state);

	BT_DBG("cache %p bdaddr %pMR state %d", cache, bdaddr, state);



	list_for_each_entry(e, &cache->resolve, list) {

		if (!bacmp(bdaddr, BDADDR_ANY) && e->name_state == state)
@@ -475,7 +475,7 @@ bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data, 
	struct discovery_state *cache = &hdev->discovery;

	struct inquiry_entry *ie;



	BT_DBG("cache %p, %s", cache, batostr(&data->bdaddr));

	BT_DBG("cache %p, %pMR", cache, &data->bdaddr);



	if (ssp)

		*ssp = data->ssp_mode;
@@ -1257,7 +1257,7 @@ int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key, 
		list_add(&key->list, &hdev->link_keys);

	}



	BT_DBG("%s key for %s type %u", hdev->name, batostr(bdaddr), type);

	BT_DBG("%s key for %pMR type %u", hdev->name, bdaddr, type);



	/* Some buggy controller combinations generate a changed

	 * combination key for legacy pairing even when there's no
@@ -1336,7 +1336,7 @@ int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr) 
	if (!key)

		return -ENOENT;



	BT_DBG("%s removing %s", hdev->name, batostr(bdaddr));

	BT_DBG("%s removing %pMR", hdev->name, bdaddr);



	list_del(&key->list);

	kfree(key);
@@ -1352,7 +1352,7 @@ int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr) 
		if (bacmp(bdaddr, &k->bdaddr))

			continue;



		BT_DBG("%s removing %s", hdev->name, batostr(bdaddr));

		BT_DBG("%s removing %pMR", hdev->name, bdaddr);



		list_del(&k->list);

		kfree(k);
@@ -1399,7 +1399,7 @@ int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr) 
	if (!data)

		return -ENOENT;



	BT_DBG("%s removing %s", hdev->name, batostr(bdaddr));

	BT_DBG("%s removing %pMR", hdev->name, bdaddr);



	list_del(&data->list);

	kfree(data);
@@ -1438,7 +1438,7 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash, 
	memcpy(data->hash, hash, sizeof(data->hash));

	memcpy(data->randomizer, randomizer, sizeof(data->randomizer));



	BT_DBG("%s for %s", hdev->name, batostr(bdaddr));

	BT_DBG("%s for %pMR", hdev->name, bdaddr);



	return 0;

}
@@ -2309,8 +2309,8 @@ static void hci_link_tx_to(struct hci_dev *hdev, __u8 type) 
	/* Kill stalled connections */

	list_for_each_entry_rcu(c, &h->list, list) {

		if (c->type == type && c->sent) {

			BT_ERR("%s killing stalled connection %s",

			       hdev->name, batostr(&c->dst));

			BT_ERR("%s killing stalled connection %pMR",

			       hdev->name, &c->dst);

			hci_acl_disconn(c, HCI_ERROR_REMOTE_USER_TERM);

		}

	}

net/bluetooth/hci_event.c

+7 −8
Original line number Diff line number Diff line
@@ -1266,7 +1266,7 @@ static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) 


	conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &cp->bdaddr);



	BT_DBG("%s bdaddr %s hcon %p", hdev->name, batostr(&cp->bdaddr), conn);

	BT_DBG("%s bdaddr %pMR hcon %p", hdev->name, &cp->bdaddr, conn);



	if (status) {

		if (conn && conn->state == BT_CONNECT) {
@@ -1695,8 +1695,7 @@ static void hci_cs_le_create_conn(struct hci_dev *hdev, __u8 status) 
			return;

		}



		BT_DBG("%s bdaddr %s conn %p", hdev->name, batostr(&conn->dst),

		       conn);

		BT_DBG("%s bdaddr %pMR conn %p", hdev->name, &conn->dst, conn);



		conn->state = BT_CLOSED;

		mgmt_connect_failed(hdev, &conn->dst, conn->type,
@@ -1910,7 +1909,7 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	struct hci_ev_conn_request *ev = (void *) skb->data;

	int mask = hdev->link_mode;



	BT_DBG("%s bdaddr %s type 0x%x", hdev->name, batostr(&ev->bdaddr),

	BT_DBG("%s bdaddr %pMR type 0x%x", hdev->name, &ev->bdaddr,

	       ev->link_type);



	mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type);
@@ -2809,13 +2808,13 @@ static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 


	key = hci_find_link_key(hdev, &ev->bdaddr);

	if (!key) {

		BT_DBG("%s link key not found for %s", hdev->name,

		       batostr(&ev->bdaddr));

		BT_DBG("%s link key not found for %pMR", hdev->name,

		       &ev->bdaddr);

		goto not_found;

	}



	BT_DBG("%s found key type %u for %s", hdev->name, key->type,

	       batostr(&ev->bdaddr));

	BT_DBG("%s found key type %u for %pMR", hdev->name, key->type,

	       &ev->bdaddr);



	if (!test_bit(HCI_DEBUG_KEYS, &hdev->dev_flags) &&

	    key->type == HCI_LK_DEBUG_COMBINATION) {

net/bluetooth/l2cap_core.c

+3 −3
Original line number Diff line number Diff line
@@ -1471,7 +1471,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, 
	__u8 auth_type;

	int err;



	BT_DBG("%s -> %s (type %u) psm 0x%2.2x", batostr(src), batostr(dst),

	BT_DBG("%pMR -> %pMR (type %u) psm 0x%2.2x", src, dst,

	       dst_type, __le16_to_cpu(psm));



	hdev = hci_get_route(dst, src);
@@ -5346,7 +5346,7 @@ int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr) 
	int exact = 0, lm1 = 0, lm2 = 0;

	struct l2cap_chan *c;



	BT_DBG("hdev %s, bdaddr %s", hdev->name, batostr(bdaddr));

	BT_DBG("hdev %s, bdaddr %pMR", hdev->name, bdaddr);



	/* Find listening sockets and check their link_mode */

	read_lock(&chan_list_lock);
@@ -5376,7 +5376,7 @@ void l2cap_connect_cfm(struct hci_conn *hcon, u8 status) 
{

	struct l2cap_conn *conn;



	BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status);

	BT_DBG("hcon %p bdaddr %pMR status %d", hcon, &hcon->dst, status);



	if (!status) {

		conn = l2cap_conn_add(hcon, status);