summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorPeter Hüwe <PeterHuewe@gmx.de>2014-09-12 21:09:47 +0200
committerWolfram Sang <wsa@the-dreams.de>2014-09-25 16:08:15 +0200
commit0aef44e84ad16cd87a88df78773fd81ecca34f11 (patch)
treec50a07ae7431e7cc42117f34afc070fb195dc488 /drivers/i2c
parent17f4a5c47f28de9ea59182f48d07f8c44ee5dcc9 (diff)
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>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/i2c-core.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b696ac7e6d86..ccfbbab82a15 100644
--- 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;