diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-27 18:11:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-27 18:11:55 -0700 |
| commit | 11d6b41f25d5ba912ade681bc5a8a78e5ba99efa (patch) | |
| tree | 92041a93cc5791890fab4c10b0c2b16a305a1ddc | |
| parent | 1b02c94edb0b3647ca153e4d167c7992951bf202 (diff) | |
| parent | 863ad786eb08087d6dafbc02bfd1a93fa9446af5 (diff) | |
Merge "msm: sde: Fix potential deferencing of null pointer"
| -rw-r--r-- | drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c b/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c index 34ec6529d8ae..8157e8641e60 100644 --- a/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c +++ b/drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c @@ -1771,6 +1771,10 @@ static int sde_hw_rotator_config(struct sde_rot_hw_resource *hw, wb_cfg.fps = entry->perf->config.frame_rate; wb_cfg.bw = entry->perf->bw; wb_cfg.fmt = sde_get_format_params(item->output.format); + if (!wb_cfg.fmt) { + SDEROT_ERR("Output format is NULL\n"); + return -EINVAL; + } wb_cfg.dst_rect = &item->dst_rect; wb_cfg.data = &entry->dst_buf; sde_mdp_get_plane_sizes(wb_cfg.fmt, item->output.width, |