i2c: acpi: Fix NULL Pointer dereference

If adapter->dev.parent == NULL there is a NULL pointer dereference in
acpi_i2c_install_space_handler and acpi_i2c_remove_space_handler.

This is present since introduction of this code:
366047515c6e "i2c: rework kernel config I2C_ACPI" or even
da3c6647ee08 "I2C/ACPI: Clean up I2C ACPI code and Add CONFIG_I2C_ACPI"

The adapter->dev.parent == NULL case is valid for the i2c_stub,
so loading i2c_stub with ACPI_I2C_OPREGION enabled results in an oops.
This is also valid at least for i2c_tiny_usb and i2c_robotfuzz_osif.

Fix by checking whether it is null before calling ACPI_HANDLE.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b696ac7e6d867645dc15b18a4793c9b05905289a..ccfbbab82a157da532fb039f7032d0de38680d0f 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -371,10 +371,15 @@ acpi_i2c_space_handler(u32 function, acpi_physical_address command,
 
 static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
 {
-       acpi_handle handle = ACPI_HANDLE(adapter->dev.parent);
+       acpi_handle handle;
        struct acpi_i2c_handler_data *data;
        acpi_status status;
 
+       if (!adapter->dev.parent)
+               return -ENODEV;
+
+       handle = ACPI_HANDLE(adapter->dev.parent);
+
        if (!handle)
                return -ENODEV;
 
@@ -407,10 +412,15 @@ static int acpi_i2c_install_space_handler(struct i2c_adapter *adapter)
 
 static void acpi_i2c_remove_space_handler(struct i2c_adapter *adapter)
 {
-       acpi_handle handle = ACPI_HANDLE(adapter->dev.parent);
+       acpi_handle handle;
        struct acpi_i2c_handler_data *data;
        acpi_status status;
 
+       if (!adapter->dev.parent)
+               return;
+
+       handle = ACPI_HANDLE(adapter->dev.parent);
+
        if (!handle)
                return;