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

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

Bluetooth: Add smp_sufficient_security helper function 



This function is needed both by the smp_conn_security function as well
as upcoming code to check for the security requirements when receiving
an L2CAP connect request over LE.

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

net/bluetooth/smp.c

+12 −4
Original line number Diff line number Diff line
@@ -750,6 +750,17 @@ static u8 smp_cmd_security_req(struct l2cap_conn *conn, struct sk_buff *skb) 
	return 0;

}



bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level)

{

	if (sec_level == BT_SECURITY_LOW)

		return true;



	if (hcon->sec_level >= sec_level)

		return true;



	return false;

}



int smp_conn_security(struct hci_conn *hcon, __u8 sec_level)

{

	struct l2cap_conn *conn = hcon->l2cap_data;
@@ -761,10 +772,7 @@ int smp_conn_security(struct hci_conn *hcon, __u8 sec_level) 
	if (!test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags))

		return 1;



	if (sec_level == BT_SECURITY_LOW)

		return 1;



	if (hcon->sec_level >= sec_level)

	if (smp_sufficient_security(hcon, sec_level))

		return 1;



	if (hcon->link_mode & HCI_LM_MASTER)

net/bluetooth/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ struct smp_chan { 
};



/* SMP Commands */

bool smp_sufficient_security(struct hci_conn *hcon, u8 sec_level);

int smp_conn_security(struct hci_conn *hcon, __u8 sec_level);

int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb);

int smp_distribute_keys(struct l2cap_conn *conn, __u8 force);