evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: mdss: Memset commit structure in compat path"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-05 02:08:49 -08:00 • committed by Gerrit - the friendly Code Review server
commit fbc0f1b44f
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/fbdev/msm/mdss_compat_utils.c
View file

@ -313,6 +313,8 @@ static int __compat_atomic_commit(struct fb_info *info, unsigned int cmd,
ret = -EFAULT; ret = -EFAULT;
return ret; return ret;
} }
memset(&commit, 0, sizeof(struct mdp_layer_commit));
__copy_atomic_commit_struct(&commit, &commit32); __copy_atomic_commit_struct(&commit, &commit32);
if (commit32.commit_v1.output_layer) { if (commit32.commit_v1.output_layer) {

1
drivers/video/fbdev/msm/mdss_compat_utils.h
View file

@ -536,6 +536,7 @@ struct mdp_layer_commit_v1_32 {
int retire_fence; int retire_fence;
compat_caddr_t dest_scaler; compat_caddr_t dest_scaler;
uint32_t dest_scaler_cnt; uint32_t dest_scaler_cnt;
compat_caddr_t frc_info;
uint32_t reserved[MDP_LAYER_COMMIT_V1_PAD]; uint32_t reserved[MDP_LAYER_COMMIT_V1_PAD];
}; };