diff options
| author | Atilla Filiz <atilla.filiz@essensium.com> | 2014-04-11 16:51:23 +0200 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2014-04-26 11:14:51 +0100 |
| commit | b9b3a41893c3f1be67b5aacfa525969914bea0e9 (patch) | |
| tree | 09da1c68f682e1f5b4e4803591bd4857f7e79101 /drivers/iio | |
| parent | c60e5760b0a62b072ba00ac07643d9b6fb29f2b4 (diff) | |
| download | linux-b9b3a41893c3f1be67b5aacfa525969914bea0e9.tar.bz2 | |
iio:imu:mpu6050: Fixed segfault in Invensens MPU driver due to null dereference
The driver segfaults when the kernel boots with device tree as the
platform data is then not present and the pointer is deferenced without
checking it is not null. This patch introduces such a check avoiding the
crash.
Signed-off-by: Atilla Filiz <atilla.filiz@essensium.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Cc: Stable@vger.kernel.org
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index cb9f96b446a5..d8ad606c7cd0 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -660,6 +660,7 @@ static int inv_mpu_probe(struct i2c_client *client, { struct inv_mpu6050_state *st; struct iio_dev *indio_dev; + struct inv_mpu6050_platform_data *pdata; int result; if (!i2c_check_functionality(client->adapter, @@ -672,8 +673,10 @@ static int inv_mpu_probe(struct i2c_client *client, st = iio_priv(indio_dev); st->client = client; - st->plat_data = *(struct inv_mpu6050_platform_data - *)dev_get_platdata(&client->dev); + pdata = (struct inv_mpu6050_platform_data + *)dev_get_platdata(&client->dev); + if (pdata) + st->plat_data = *pdata; /* power is turned on inside check chip type*/ result = inv_check_and_setup_chip(st, id); if (result) |