summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-12-09 19:59:39 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-09 19:59:39 -0800
commitb6b2f0da26e124c82d6f6340b0aff0749bebfc6b (patch)
tree718689a03893231bb8ac8fcaff177acdc058e06f
parent2528ee722f01324e5223a8dfe75c3c5804e17bbd (diff)
parent232554ded3f435276a9d3135c27167808167bfea (diff)
Merge "msm: vidc: Fix kw issues"
-rw-r--r--drivers/media/platform/msm/vidc/msm_vidc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc.c b/drivers/media/platform/msm/vidc/msm_vidc.c
index ac5f83f1d034..28faa1436ef5 100644
--- a/drivers/media/platform/msm/vidc/msm_vidc.c
+++ b/drivers/media/platform/msm/vidc/msm_vidc.c
@@ -318,6 +318,10 @@ err_invalid_input:
static inline void populate_buf_info(struct buffer_info *binfo,
struct v4l2_buffer *b, u32 i)
{
+ if (i >= VIDEO_MAX_PLANES) {
+ dprintk(VIDC_ERR, "%s: Invalid input\n", __func__);
+ return;
+ }
binfo->type = b->type;
binfo->fd[i] = b->m.planes[i].reserved[0];
binfo->buff_off[i] = b->m.planes[i].reserved[1];