Commit 0a3664a1 authored Feb 27, 2023 by Kang Chen Committed by Greg Kroah-Hartman Mar 17, 2023

nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties



[ Upstream commit 11f180a5d62a51b484e9648f9b310e1bd50b1a57 ]

devm_kmalloc_array may fails, *fw_vsc_cfg might be null and cause
out-of-bounds write in device_property_read_u8_array later.

Fixes: a06347c0 ("NFC: Add Intel Fields Peak NFC solution driver")
Signed-off-by: Kang Chen <void0red@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/20230227093037.907654-1-void0red@gmail.com


Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 43f33642

drivers/nfc/fdp/i2c.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -255,6 +255,9 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev,
		len, sizeof(**fw_vsc_cfg),
		GFP_KERNEL);

		if (!*fw_vsc_cfg)
		goto alloc_err;

		r = device_property_read_u8_array(dev, FDP_DP_FW_VSC_CFG_NAME,
		*fw_vsc_cfg, len);

		@@ -268,6 +271,7 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev,
		*fw_vsc_cfg = NULL;
		}

		alloc_err:
		dev_dbg(dev, "Clock type: %d, clock frequency: %d, VSC: %s",
		clock_type, clock_freq, *fw_vsc_cfg != NULL ? "yes" : "no");
		}