summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorKrishna Manikandan <mkrishn@codeaurora.org>2016-12-28 18:06:12 +0530
committerKrishna Manikandan <mkrishn@codeaurora.org>2017-01-02 10:44:36 +0530
commit42507841e7d4250361000a84603eb63d473d352f (patch)
treebf02661c586df5feed7feb900b335106a9c9cf2c /drivers/video/fbdev
parent90fd65ba93d5c3c767ce58fb1d172d511988976a (diff)
msm: mdss: Memset commit structure in compat path
Memset commit structure in compat path ioctl as some of the pointer variables might go uninitialized, if not explicitly initialized by the userspace. These uninitialized variables contain garbage values which can further result in kernel crash. Change-Id: I09518a43438e27751f2b918d682f551550c4342e Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org> Signed-off-by: Krishna Manikandan <mkrishn@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/msm/mdss_compat_utils.c2
-rw-r--r--drivers/video/fbdev/msm/mdss_compat_utils.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_compat_utils.c b/drivers/video/fbdev/msm/mdss_compat_utils.c
index 79bd97c4ce28..f499cdfd85ef 100644
--- a/drivers/video/fbdev/msm/mdss_compat_utils.c
+++ b/drivers/video/fbdev/msm/mdss_compat_utils.c
@@ -313,6 +313,8 @@ static int __compat_atomic_commit(struct fb_info *info, unsigned int cmd,
ret = -EFAULT;
return ret;
}
+
+ memset(&commit, 0, sizeof(struct mdp_layer_commit));
__copy_atomic_commit_struct(&commit, &commit32);
if (commit32.commit_v1.output_layer) {
diff --git a/drivers/video/fbdev/msm/mdss_compat_utils.h b/drivers/video/fbdev/msm/mdss_compat_utils.h
index 7a831ab82942..626792925cb6 100644
--- a/drivers/video/fbdev/msm/mdss_compat_utils.h
+++ b/drivers/video/fbdev/msm/mdss_compat_utils.h
@@ -536,6 +536,7 @@ struct mdp_layer_commit_v1_32 {
int retire_fence;
compat_caddr_t dest_scaler;
uint32_t dest_scaler_cnt;
+ compat_caddr_t frc_info;
uint32_t reserved[MDP_LAYER_COMMIT_V1_PAD];
};