]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Bluetooth: hci_sync: Use cmd->num_cis instead of magic number
authorGustavo A. R. Silva <gustavoars@kernel.org>
Wed, 1 May 2024 17:50:02 +0000 (11:50 -0600)
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Tue, 14 May 2024 14:51:07 +0000 (10:51 -0400)
At the moment of the check, `cmd->num_cis` holds the value of 0x1f,
which is the max number of elements in the `cmd->cis[]` array at
declaration, which is 0x1f.

So, avoid using 0x1f directly, and instead use `cmd->num_cis`. Similarly
to this other patch[1].

Link: https://lore.kernel.org/linux-hardening/ZivaHUQyDDK9fXEk@neat/
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
net/bluetooth/hci_sync.c

index 406e36cacd79dbf4229aa39c4c16d90f222b10a3..813c11d61bca8084e053550f0bc14113ae4ea98e 100644 (file)
@@ -6556,7 +6556,7 @@ int hci_le_create_cis_sync(struct hci_dev *hdev)
                cis->cis_handle = cpu_to_le16(conn->handle);
                aux_num_cis++;
 
-               if (aux_num_cis >= 0x1f)
+               if (aux_num_cis >= cmd->num_cis)
                        break;
        }
        cmd->num_cis = aux_num_cis;