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: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20241209220522.25288-1-hdegoede@redhat.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
index d881b2cfcdfcfbd079b749c7a8bf4f183e0eace4..09fff213b0911c2e1a62dd4a115fad8c525f7674 100644 (file)
--- a/drivers/platform/x86/intel/int3472/discrete.c
+++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -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");

diff --git a/drivers/platform/x86/intel/int3472/tps68470.c b/drivers/platform/x86/intel/int3472/tps68470.c
index 1e107fd49f828c78aa2a30bae197cc31660ce602..81ac4c6919630941add4c9eeb894ff144b527644 100644 (file)
--- a/drivers/platform/x86/intel/int3472/tps68470.c
+++ b/drivers/platform/x86/intel/int3472/tps68470.c
@@ -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;