[PATCH 1/4] android/gatt: Change check permissions order

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Firstly we should check if characteristic needs MITM permissions,
and next check for ENCRYPTION permissions. Now remote device can
increase security to MITM immediatelly (i.e. from sec LOW to HIGH).
---
 android/gatt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/android/gatt.c b/android/gatt.c
index 558b203..cfcfd9b 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -4063,14 +4063,14 @@ static uint8_t check_device_permissions(struct gatt_device *device,
 		if (!(permissions & GATT_PERM_READ))
 			return ATT_ECODE_READ_NOT_PERM;
 
-		if ((permissions & GATT_PERM_READ_ENCRYPTED) &&
-						sec_level < BT_SECURITY_MEDIUM)
-			return ATT_ECODE_INSUFF_ENC;
-
 		if ((permissions & GATT_PERM_READ_MITM) &&
 						sec_level < BT_SECURITY_HIGH)
 			return ATT_ECODE_AUTHENTICATION;
 
+		if ((permissions & GATT_PERM_READ_ENCRYPTED) &&
+						sec_level < BT_SECURITY_MEDIUM)
+			return ATT_ECODE_INSUFF_ENC;
+
 		if (permissions & GATT_PERM_READ_AUTHORIZATION)
 			return ATT_ECODE_AUTHORIZATION;
 		break;
@@ -4081,14 +4081,14 @@ static uint8_t check_device_permissions(struct gatt_device *device,
 		if (!(permissions & GATT_PERM_WRITE))
 			return ATT_ECODE_WRITE_NOT_PERM;
 
-		if ((permissions & GATT_PERM_WRITE_ENCRYPTED) &&
-						sec_level < BT_SECURITY_MEDIUM)
-			return ATT_ECODE_INSUFF_ENC;
-
 		if ((permissions & GATT_PERM_WRITE_MITM) &&
 						sec_level < BT_SECURITY_HIGH)
 			return ATT_ECODE_AUTHENTICATION;
 
+		if ((permissions & GATT_PERM_WRITE_ENCRYPTED) &&
+						sec_level < BT_SECURITY_MEDIUM)
+			return ATT_ECODE_INSUFF_ENC;
+
 		if (permissions & GATT_PERM_WRITE_AUTHORIZATION)
 			return ATT_ECODE_AUTHORIZATION;
 		break;
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux