Bluetooth: hci_intel: Fix null gpio desc pointer dereference (32b9ccbc) · Commits · 戴 / test

gpiod_get_optional can return either ERR_PTR or NULL pointer. NULL case is not tested and then dereferenced later in desc_to_gpio. Fix this by using non optional version which returns ERR_PTR in any error case (this is not an optional gpio). Use the same non optional version for the host-wake gpio. Fixes: ("Bluetooth: hci_intel: Retrieve host-wake IRQ") Signed-off-by:

Loic Poulain <loic.poulain@intel.com> Signed-off-by:

Marcel Holtmann <marcel@holtmann.org>

drivers/bluetooth/hci_intel.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1210,8 +1210,7 @@ static int intel_probe(struct platform_device *pdev)

		idev->pdev = pdev;

		idev->reset = devm_gpiod_get_optional(&pdev->dev, "reset",
		GPIOD_OUT_LOW);
		idev->reset = devm_gpiod_get(&pdev->dev, "reset", GPIOD_OUT_LOW);
		if (IS_ERR(idev->reset)) {
		dev_err(&pdev->dev, "Unable to retrieve gpio\n");
		return PTR_ERR(idev->reset);
		@@ -1223,8 +1222,7 @@ static int intel_probe(struct platform_device *pdev)

		dev_err(&pdev->dev, "No IRQ, falling back to gpio-irq\n");

		host_wake = devm_gpiod_get_optional(&pdev->dev, "host-wake",
		GPIOD_IN);
		host_wake = devm_gpiod_get(&pdev->dev, "host-wake", GPIOD_IN);
		if (IS_ERR(host_wake)) {
		dev_err(&pdev->dev, "Unable to retrieve IRQ\n");
		goto no_irq;

Admin message