Commit c2b2a1a7 authored by Radoslaw Biernacki's avatar Radoslaw Biernacki Committed by Marcel Holtmann
Browse files

Bluetooth: Improve skb handling in mgmt_device_connected() 



This patch introduce eir_skb_put_data() that can be used to simplify
operations on eir in goal of eliminating the necessity of intermediary
buffers.
eir_skb_put_data() is in pair to what eir_append_data() does with help of
eir_len, but without awkwardness when passing return value to skb_put() (as
it returns updated offset not size).

Signed-off-by: default avatarRadoslaw Biernacki <rad@semihalf.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent ba17bb62

net/bluetooth/eir.h

+15 −0
Original line number Diff line number Diff line
@@ -41,6 +41,21 @@ static inline u16 eir_append_le16(u8 *eir, u16 eir_len, u8 type, u16 data) 
	return eir_len;

}



static inline u16 eir_skb_put_data(struct sk_buff *skb, u8 type, u8 *data, u8 data_len)

{

	u8 *eir;

	u16 eir_len;



	eir_len	= eir_precalc_len(data_len);

	eir = skb_put(skb, eir_len);

	WARN_ON(sizeof(type) + data_len > U8_MAX);

	eir[0] = sizeof(type) + data_len;

	eir[1] = type;

	memcpy(&eir[2], data, data_len);



	return eir_len;

}



static inline void *eir_get_data(u8 *eir, size_t eir_len, u8 type,

				 size_t *data_len)

{

net/bluetooth/mgmt.c

+8 −17
Original line number Diff line number Diff line
@@ -9111,18 +9111,12 @@ void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn, 
		skb_put_data(skb, conn->le_adv_data, conn->le_adv_data_len);

		eir_len = conn->le_adv_data_len;

	} else {

		if (name_len > 0) {

			eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE,

						  name, name_len);

			skb_put(skb, eir_len);

		}

		if (name)

			eir_len += eir_skb_put_data(skb, EIR_NAME_COMPLETE, name, name_len);



		if (memcmp(conn->dev_class, "\0\0\0", 3) != 0) {

			eir_len = eir_append_data(ev->eir, eir_len,

						  EIR_CLASS_OF_DEV,

						  conn->dev_class, 3);

			skb_put(skb, 5);

		}

		if (memcmp(conn->dev_class, "\0\0\0", sizeof(conn->dev_class)))

			eir_len += eir_skb_put_data(skb, EIR_CLASS_OF_DEV,

						    conn->dev_class, sizeof(conn->dev_class));

	}



	ev->eir_len = cpu_to_le16(eir_len);
@@ -9822,13 +9816,10 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, 
	ev->addr.type = link_to_bdaddr(link_type, addr_type);

	ev->rssi = rssi;



	if (name) {

		eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name,

					  name_len);

		skb_put(skb, eir_len);

	} else {

	if (name)

		eir_len += eir_skb_put_data(skb, EIR_NAME_COMPLETE, name, name_len);

	else

		flags = MGMT_DEV_FOUND_NAME_REQUEST_FAILED;

	}



	ev->eir_len = cpu_to_le16(eir_len);

	ev->flags = cpu_to_le32(flags);