diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-06-08 18:42:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-06-08 18:42:13 -0700 |
| commit | 45ac2680dd2a2ecf1a3abb6085ef7dcee26c65a9 (patch) | |
| tree | 7a622f5edee2dfa45b418e9023bfc0f425d1296a | |
| parent | c97344760e118bca49a940294bf047c79c4a3080 (diff) | |
| parent | 2ce70405dce2d040195e3860422173695825b0fb (diff) | |
Merge "ais: sensor: fixing invalid address access issue during cci read"
| -rw-r--r-- | drivers/media/platform/msm/ais/sensor/msm_sensor.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/ais/sensor/msm_sensor.c b/drivers/media/platform/msm/ais/sensor/msm_sensor.c index 0dda3a64b1a2..7434ba49fb8d 100644 --- a/drivers/media/platform/msm/ais/sensor/msm_sensor.c +++ b/drivers/media/platform/msm/ais/sensor/msm_sensor.c @@ -1242,7 +1242,12 @@ int msm_sensor_config(struct msm_sensor_ctrl_t *s_ctrl, void *argp) pr_err("%s:%d: i2c_read failed\n", __func__, __LINE__); break; } - read_config_ptr->data = local_data; + if (copy_to_user((void __user *)&read_config_ptr->data, + &local_data, sizeof(local_data))) { + pr_err("%s:%d failed\n", __func__, __LINE__); + rc = -EFAULT; + break; + } break; } case CFG_SLAVE_WRITE_I2C_ARRAY: { |