Skip to content

Commit dc48ca1

Browse files
bebarinogregkh
authored andcommitted
drm/msm: Avoid div-by-zero in dpu_crtc_atomic_check()
[ Upstream commit 22f7609 ] The cstate->num_mixers member is only set to a non-zero value once dpu_encoder_virt_mode_set() is called, but the atomic check function can be called by userspace before that. Let's avoid the div-by-zero here and inside _dpu_crtc_setup_lm_bounds() by skipping this part of the atomic check if dpu_encoder_virt_mode_set() hasn't been called yet. This fixes an UBSAN warning: UBSAN: Undefined behaviour in drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c:860:31 division by zero CPU: 7 PID: 409 Comm: frecon Tainted: G S 5.4.31 #128 Hardware name: Google Trogdor (rev0) (DT) Call trace: dump_backtrace+0x0/0x14c show_stack+0x20/0x2c dump_stack+0xa0/0xd8 __ubsan_handle_divrem_overflow+0xec/0x110 dpu_crtc_atomic_check+0x97c/0x9d4 drm_atomic_helper_check_planes+0x160/0x1c8 drm_atomic_helper_check+0x54/0xbc drm_atomic_check_only+0x6a8/0x880 drm_atomic_commit+0x20/0x5c drm_atomic_helper_set_config+0x98/0xa0 drm_mode_setcrtc+0x308/0x5dc drm_ioctl_kernel+0x9c/0x114 drm_ioctl+0x2ac/0x4b0 drm_compat_ioctl+0xe8/0x13c __arm64_compat_sys_ioctl+0x184/0x324 el0_svc_common+0xa4/0x154 el0_svc_compat_handler+0x Cc: Abhinav Kumar <[email protected]> Cc: Jeykumar Sankaran <[email protected]> Cc: Jordan Crouse <[email protected]> Cc: Sean Paul <[email protected]> Fixes: 25fdd59 ("drm/msm: Add SDM845 DPU support") Signed-off-by: Stephen Boyd <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Tested-by: Sai Prakash Ranjan <[email protected]> Signed-off-by: Rob Clark <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent b7d5398 commit dc48ca1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
881881
struct drm_plane *plane;
882882
struct drm_display_mode *mode;
883883

884-
int cnt = 0, rc = 0, mixer_width, i, z_pos;
884+
int cnt = 0, rc = 0, mixer_width = 0, i, z_pos;
885885

886886
struct dpu_multirect_plane_states multirect_plane[DPU_STAGE_MAX * 2];
887887
int multirect_count = 0;
@@ -914,9 +914,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
914914

915915
memset(pipe_staged, 0, sizeof(pipe_staged));
916916

917-
mixer_width = mode->hdisplay / cstate->num_mixers;
917+
if (cstate->num_mixers) {
918+
mixer_width = mode->hdisplay / cstate->num_mixers;
918919

919-
_dpu_crtc_setup_lm_bounds(crtc, state);
920+
_dpu_crtc_setup_lm_bounds(crtc, state);
921+
}
920922

921923
crtc_rect.x2 = mode->hdisplay;
922924
crtc_rect.y2 = mode->vdisplay;

0 commit comments

Comments
 (0)