diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-14 09:57:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-14 09:57:03 -0700 |
| commit | 482776bedcbb54e14aae8d9cc23c95fd901c187c (patch) | |
| tree | 9b690cc6e68ec9e20bd2174058aed9e1c243ff88 | |
| parent | abc9a0c87d7ba9920409014b2d80f9eb80617cd3 (diff) | |
| parent | 25eeb3a3b2a3b35bd6a2fd12d4a0dcc4ef1ac1b5 (diff) | |
Merge "msm: isp: camera: Avoid potential out of bound write"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c index ab7d4e86dcac..ab981f762dd2 100644 --- a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c +++ b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c @@ -1021,6 +1021,11 @@ static void msm_ispif_config_stereo(struct ispif_device *ispif, for (i = 0; i < params->num; i++) { vfe_intf = params->entries[i].vfe_intf; + if (!msm_ispif_is_intf_valid(ispif->csid_version, vfe_intf)) { + pr_err("%s: invalid interface type %d\n", __func__, + vfe_intf); + return; + } if (params->entries[i].intftype == PIX0 && params->stereo_enable && params->right_entries[i].csid < CSID_MAX && |