Commit 5622592f authored Oct 13, 2023 by Krzysztof Kozlowski Committed by Greg Kroah-Hartman Oct 25, 2023

nfc: nci: fix possible NULL pointer dereference in send_acknowledge()



commit 7937609cd387246aed994e81aa4fa951358fba41 upstream.

Handle memory allocation failure from nci_skb_alloc() (calling
alloc_skb()) to avoid possible NULL pointer dereference.

Reported-by: 黄思聪 <huangsicong@iie.ac.cn>
Fixes: 391d8a2d ("NFC: Add NCI over SPI receive")
Cc: <stable@vger.kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20231013184129.18738-1-krzysztof.kozlowski@linaro.org


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 5afc7720

net/nfc/nci/spi.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,8 @@ static int send_acknowledge(struct nci_spi *nspi, u8 acknowledge)
		int ret;

		skb = nci_skb_alloc(nspi->ndev, 0, GFP_KERNEL);
		if (!skb)
		return -ENOMEM;

		/* add the NCI SPI header to the start of the buffer */
		hdr = skb_push(skb, NCI_SPI_HDR_LEN);