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

Commit f0358568 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Add blacklist support for incoming connections 



In some circumstances it could be desirable to reject incoming
connections on the baseband level. This patch adds this feature through
two new ioctl's: HCIBLOCKADDR and HCIUNBLOCKADDR. Both take a simple
Bluetooth address as a parameter. BDADDR_ANY can be used with
HCIUNBLOCKADDR to remove all devices from the blacklist.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@nokia.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 95ffa978

fs/compat_ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,8 @@ COMPATIBLE_IOCTL(HCISETLINKPOL) 
COMPATIBLE_IOCTL(HCISETLINKMODE)

COMPATIBLE_IOCTL(HCISETACLMTU)

COMPATIBLE_IOCTL(HCISETSCOMTU)

COMPATIBLE_IOCTL(HCIBLOCKADDR)

COMPATIBLE_IOCTL(HCIUNBLOCKADDR)

COMPATIBLE_IOCTL(HCIINQUIRY)

COMPATIBLE_IOCTL(HCIUARTSETPROTO)

COMPATIBLE_IOCTL(HCIUARTGETPROTO)

include/net/bluetooth/hci.h

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,9 @@ enum { 
#define HCISETACLMTU	_IOW('H', 227, int)

#define HCISETSCOMTU	_IOW('H', 228, int)



#define HCIBLOCKADDR	_IOW('H', 230, int)

#define HCIUNBLOCKADDR	_IOW('H', 231, int)



#define HCIINQUIRY	_IOR('H', 240, int)



/* HCI timeouts */

include/net/bluetooth/hci_core.h

+9 −0
Original line number Diff line number Diff line
@@ -62,6 +62,11 @@ struct hci_conn_hash { 
	unsigned int     sco_num;

};



struct bdaddr_list {

	struct list_head list;

	bdaddr_t bdaddr;

};



struct hci_dev {

	struct list_head list;

	spinlock_t	lock;
@@ -127,6 +132,7 @@ struct hci_dev { 


	struct inquiry_cache	inq_cache;

	struct hci_conn_hash	conn_hash;

	struct bdaddr_list	blacklist;



	struct hci_dev_stats	stat;
@@ -424,6 +430,9 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg); 
int hci_get_auth_info(struct hci_dev *hdev, void __user *arg);

int hci_inquiry(void __user *arg);



struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr);

int hci_blacklist_clear(struct hci_dev *hdev);



void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);



int hci_recv_frame(struct sk_buff *skb);

net/bluetooth/hci_core.c

+3 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	hci_dev_lock_bh(hdev);

	inquiry_cache_flush(hdev);

	hci_conn_hash_flush(hdev);

	hci_blacklist_clear(hdev);

	hci_dev_unlock_bh(hdev);



	hci_notify(hdev, HCI_DEV_DOWN);
@@ -923,6 +924,8 @@ int hci_register_dev(struct hci_dev *hdev) 


	hci_conn_hash_init(hdev);



	INIT_LIST_HEAD(&hdev->blacklist.list);



	memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));



	atomic_set(&hdev->promisc, 0);

net/bluetooth/hci_event.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk 


	mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type);



	if (mask & HCI_LM_ACCEPT) {

	if ((mask & HCI_LM_ACCEPT) && !hci_blacklist_lookup(hdev, &ev->bdaddr)) {

		/* Connection accepted */

		struct inquiry_entry *ie;

		struct hci_conn *conn;