Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 03:43:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge "msm: camera: isp: Fix command length check."

Browse source
This commit is contained in:
Linux Build Service Account 2014-05-01 11:23:43 -07:00 committed by Gerrit - the friendly Code Review server
parent 7307c6acf0 18e2d23364
commit 2892339083
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c
View file

@ -900,19 +900,22 @@ static int msm_isp_send_hw_cmd(struct vfe_device *vfe_dev,
}
case GET_MAX_CLK_RATE: {
int rc = 0;
unsigned long rate;
if (cmd_len < sizeof(unsigned long)) {
if (cmd_len != sizeof(__u32)) {
pr_err("%s:%d failed: invalid cmd len %u exp %zu\n",
__func__, __LINE__, cmd_len,
sizeof(unsigned long));
sizeof(__u32));
return -EINVAL;
}
rc = msm_isp_get_max_clk_rate(vfe_dev,
(unsigned long *)cfg_data);
rc = msm_isp_get_max_clk_rate(vfe_dev, &rate);
if (rc < 0) {
pr_err("%s:%d failed: rc %d\n", __func__, __LINE__, rc);
return -EINVAL;
}
*(__u32 *)cfg_data = (__u32)rate;
break;
}
case GET_ISP_ID: {