diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-22 07:40:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-22 07:40:29 -0700 |
| commit | c515c98cc01e9d71a36ef2a1242ab58ef13cb48f (patch) | |
| tree | e8238e315485de379e01da4390eef6464a0614af /drivers/media | |
| parent | 86d96e09c26e5e880d6633dd0f397e0fb856e650 (diff) | |
| parent | e53f2adc3f09410a189084f21051d5f2d55c1cdf (diff) | |
Merge "msm: camera: validate num_streams in stream_cfg_cmd before using it"
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/msm/ais/isp/msm_isp_stats_util.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/ais/isp/msm_isp_stats_util.c b/drivers/media/platform/msm/ais/isp/msm_isp_stats_util.c index d3ee69a14639..6e89544161ee 100644 --- a/drivers/media/platform/msm/ais/isp/msm_isp_stats_util.c +++ b/drivers/media/platform/msm/ais/isp/msm_isp_stats_util.c @@ -863,6 +863,12 @@ int msm_isp_cfg_stats_stream(struct vfe_device *vfe_dev, void *arg) if (vfe_dev->stats_data.num_active_stream == 0) vfe_dev->hw_info->vfe_ops.stats_ops.cfg_ub(vfe_dev); + if (stream_cfg_cmd->num_streams > MSM_ISP_STATS_MAX) { + pr_err("%s invalid num_streams %d\n", __func__, + stream_cfg_cmd->num_streams); + return -EINVAL; + } + if (stream_cfg_cmd->enable) { msm_isp_stats_update_cgc_override(vfe_dev, stream_cfg_cmd); |