Merge pull request #2081 from Scepticz/patch-1

Fix l2cap_channels OOB in get_channel_for_cid
contiki-ng · Jul 21, 2022 · 3216ebf · 3216ebf
2 parents cae20d7 + f28ca56
commit 3216ebf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/os/net/mac/ble/ble-l2cap.c b/os/net/mac/ble/ble-l2cap.c
@@ -105,9 +105,9 @@ get_channel_for_addr(const linkaddr_t *peer_addr)
 static l2cap_channel_t *
 get_channel_for_cid(uint16_t own_cid)
 {
-  uint8_t i = own_cid - L2CAP_FLOW_CHANNEL;
+  int16_t i = own_cid - L2CAP_FLOW_CHANNEL;
   if(i >= 0 && i < l2cap_channel_count) {
-    return &l2cap_channels[own_cid - L2CAP_FLOW_CHANNEL];
+    return &l2cap_channels[i];
   } else {
     return NULL;
   }