diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-29 10:17:24 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-29 10:17:24 -0700 |
| commit | ace73576d2eb567f552a699109b32d0917fccdbd (patch) | |
| tree | d3541e4a82f5d2c8c33de268cf04c1aec871940c | |
| parent | 539f0433bb1806a6a3edbf64b708ad255cfe2f8d (diff) | |
| parent | ef8e3cd4588b5ae71b73a3aca751d59e882e6748 (diff) | |
Merge "msm: mdss: Fix potential dereferencing of null pointer"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index c0fd48519124..40a79c4af38e 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -3421,6 +3421,10 @@ int mdss_fb_atomic_commit(struct fb_info *info, MSMFB_ATOMIC_COMMIT, true, false); if (mfd->panel.type == WRITEBACK_PANEL) { output_layer = commit_v1->output_layer; + if (!output_layer) { + pr_err("Output layer is null\n"); + goto end; + } wb_change = !mdss_fb_is_wb_config_same(mfd, commit_v1->output_layer); if (wb_change) { |