Unverified Commit cd2fd6ea authored by Hans de Goede's avatar Hans de Goede Committed by Ilpo Järvinen
Browse files

platform/x86: int3472: Check for adev == NULL 



Not all devices have an ACPI companion fwnode, so adev might be NULL. This
can e.g. (theoretically) happen when a user manually binds one of
the int3472 drivers to another i2c/platform device through sysfs.

Add a check for adev not being set and return -ENODEV in that case to
avoid a possible NULL pointer deref in skl_int3472_get_acpi_buffer().

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20241209220522.25288-1-hdegoede@redhat.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
parent f3479920

drivers/platform/x86/intel/int3472/discrete.c

+3 −0
Original line number Diff line number Diff line
@@ -336,6 +336,9 @@ static int skl_int3472_discrete_probe(struct platform_device *pdev) 
	struct int3472_cldb cldb;

	int ret;



	if (!adev)

		return -ENODEV;



	ret = skl_int3472_fill_cldb(adev, &cldb);

	if (ret) {

		dev_err(&pdev->dev, "Couldn't fill CLDB structure\n");

drivers/platform/x86/intel/int3472/tps68470.c

+3 −0
Original line number Diff line number Diff line
@@ -152,6 +152,9 @@ static int skl_int3472_tps68470_probe(struct i2c_client *client) 
	int ret;

	int i;



	if (!adev)

		return -ENODEV;



	n_consumers = skl_int3472_fill_clk_pdata(&client->dev, &clk_pdata);

	if (n_consumers < 0)

		return n_consumers;