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

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

Bluetooth: Ignore incoming data after initiating disconnection 



When hci_chan_del is called the disconnection routines get scheduled
through a workqueue. If there's any incoming ACL data before the
routines get executed there's a chance that a new hci_chan is created
and the disconnection never happens. This patch adds a new hci_conn flag
to indicate that we're in the process of driving the connection down. We
set the flag in hci_chan_del and check for it in hci_chan_create so that
no new channels are created for the same connection.

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

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ enum { 
	HCI_CONN_FIPS,

	HCI_CONN_STK_ENCRYPT,

	HCI_CONN_AUTH_INITIATOR,

	HCI_CONN_DROP,

};



static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)

net/bluetooth/hci_conn.c

+6 −0
Original line number Diff line number Diff line
@@ -1291,6 +1291,11 @@ struct hci_chan *hci_chan_create(struct hci_conn *conn) 


	BT_DBG("%s hcon %p", hdev->name, conn);



	if (test_bit(HCI_CONN_DROP, &conn->flags)) {

		BT_DBG("Refusing to create new hci_chan");

		return NULL;

	}



	chan = kzalloc(sizeof(*chan), GFP_KERNEL);

	if (!chan)

		return NULL;
@@ -1318,6 +1323,7 @@ void hci_chan_del(struct hci_chan *chan) 


	/* Force the connection to be immediately dropped */

	conn->disc_timeout = 0;

	set_bit(HCI_CONN_DROP, &conn->flags);



	hci_conn_drop(conn);

	hci_conn_put(conn);