diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-04-26 06:33:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-26 06:33:48 -0700 |
| commit | 1399da4328aeeca4b136ccd599b90564e97b8340 (patch) | |
| tree | f383e0070b92e2acd473028f10e141b56054035c | |
| parent | f8f13e5308720d6fe8c9f0405435330691d2afee (diff) | |
| parent | fa5ee0d28490aa9a967afae1d48a37afc47834d2 (diff) | |
Merge "msm: camera: Fix kernel overwrite GET_BUF_BY_IDX ioctl"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c index 76a7c6942c68..af6206f83048 100644 --- a/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c +++ b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c @@ -553,8 +553,7 @@ static long msm_buf_mngr_subdev_ioctl(struct v4l2_subdev *sd, sizeof(struct msm_buf_mngr_info))) { return -EFAULT; } - MSM_CAM_GET_IOCTL_ARG_PTR(&k_ioctl.ioctl_ptr, - &buf_info, sizeof(void *)); + k_ioctl.ioctl_ptr = (uintptr_t)&buf_info; argp = &k_ioctl; rc = msm_cam_buf_mgr_ops(cmd, argp); } |