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

Commit dc4fe30b authored by Johan Hedberg's avatar Johan Hedberg Committed by Gustavo Padovan
Browse files

Bluetooth: mgmt: Add local name information to read_info reply 



This patch adds the name of the adapter to the reply of the read_info
management command.

The management messages reserve 249 bytes for the name instead of 248
(like in the HCI spec) so that there is always a guarantee that it is
nul-terminated. That way it can safely be passed onto string
manipulation functions.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 1f6c6378

include/net/bluetooth/mgmt.h

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ struct mgmt_rp_read_index_list { 
	__le16 index[0];

} __packed;



/* Reserve one extra byte for names in management messages so that they

 * are always guaranteed to be nul-terminated */

#define MGMT_MAX_NAME_LENGTH		(HCI_MAX_NAME_LENGTH + 1)



#define MGMT_OP_READ_INFO		0x0004

struct mgmt_rp_read_info {

	__u8 type;
@@ -55,6 +59,7 @@ struct mgmt_rp_read_info { 
	__u16 manufacturer;

	__u8 hci_ver;

	__u16 hci_rev;

	__u8 name[MGMT_MAX_NAME_LENGTH];

} __packed;



struct mgmt_mode {

net/bluetooth/mgmt.c

+4 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ static int read_controller_info(struct sock *sk, u16 index) 


	set_bit(HCI_MGMT, &hdev->flags);



	memset(&rp, 0, sizeof(rp));



	rp.type = hdev->dev_type;



	rp.powered = test_bit(HCI_UP, &hdev->flags);
@@ -204,6 +206,8 @@ static int read_controller_info(struct sock *sk, u16 index) 
	rp.hci_ver = hdev->hci_ver;

	put_unaligned_le16(hdev->hci_rev, &rp.hci_rev);



	memcpy(rp.name, hdev->dev_name, sizeof(hdev->dev_name));



	hci_dev_unlock_bh(hdev);

	hci_dev_put(hdev);