]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
NFC: nci: Add bounds checking in nci_hci_create_pipe()
authorDan Carpenter <dan.carpenter@linaro.org>
Fri, 17 Jan 2025 09:38:41 +0000 (12:38 +0300)
committerJakub Kicinski <kuba@kernel.org>
Thu, 23 Jan 2025 03:39:27 +0000 (19:39 -0800)
The "pipe" variable is a u8 which comes from the network.  If it's more
than 127, then it results in memory corruption in the caller,
nci_hci_connect_gate().

Cc: stable@vger.kernel.org
Fixes: a1b0b9415817 ("NFC: nci: Create pipe on specific gate in nci_hci_connect_gate")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/bcf5453b-7204-4297-9c20-4d8c7dacf586@stanley.mountain
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/nfc/nci/hci.c

index de175318a3a0f394247b8b1237049dc0c0fc12f2..082ab66f120b7323ce0ebae5cc6199826091a609 100644 (file)
@@ -542,6 +542,8 @@ static u8 nci_hci_create_pipe(struct nci_dev *ndev, u8 dest_host,
 
        pr_debug("pipe created=%d\n", pipe);
 
+       if (pipe >= NCI_HCI_MAX_PIPES)
+               pipe = NCI_HCI_INVALID_PIPE;
        return pipe;
 }