Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp337365pxx; Wed, 28 Oct 2020 06:12:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxo95/pheQro+fWY4m3LbAS7pZFelFpGSb6T1Il87DeqgBtfyWvVqVyL1oQoKMBaru/uUO6 X-Received: by 2002:a05:651c:216:: with SMTP id y22mr3021445ljn.350.1603890755239; Wed, 28 Oct 2020 06:12:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603890755; cv=none; d=google.com; s=arc-20160816; b=ZFUiTnf8HMn/+WJbc+g39izGhxYSflV/l2JH+I8N9wpLDBc1ZT30ya4hFGne8E1SBh 4oeg8gM2ojtbJ6El8ZpoIE4LQ8vWqGOCU5PkvKJ04fgyMXT1Rg+iWZwila2VY35exTTn s/1EX2Qnb9nZVdCNFxoeXeBMOSoiiPp8rfvY+3s2k3MYv9iFLufokydKddg3WB3D6QI4 7Ez/sGcjHE2qUF3Y7yaVD9kuT76nidrsOD+hktigk2+XXLfLLVd/7ygtYGyqDf+/TMjS LZk+ZzOnzED1PeXKBUjx1+ccDufreFj2RrrBzHxcfhaDHK9QOKF5ar0L3Oqf/Gp+57pG lXYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nk6k1a3tU6ZulBHckIo4eGjf2lnhFv7Bhbaj7N5QOhQ=; b=LMocXeHGGU8ZBTKJejCQEWnAlmXQRPP7MWiW4Fp9otDpNIehzgBWr19E261Jial19Z o/lRdp7V+9BAbr0dNsw+JCCq5d58z0fQj4Nat3zD4NOoYgc3h2m19fziEAqhd0/3K0Ml S8n7FYngfb6CMuB1TyooKijSA7yptogojsb5DdtwS0Ii0kMiuAqr/vKbP6s4DLk/06M0 sVPu5u5VIKd/G5AvPlUXD+NDZupfKtbAv2oGv3gqm5o1Kms1AbapYtH5nWydA85CpTR+ LkbXdWUGFNtuOfLgVLPVXUORTek5rcQTLBUJvf9xk9UJiJJDLVBB57rWU38diCi0Wqxj 1GGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T66ptQRu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g1si3663191edn.100.2020.10.28.06.12.12; Wed, 28 Oct 2020 06:12:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=T66ptQRu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1800165AbgJ0PfO (ORCPT + 99 others); Tue, 27 Oct 2020 11:35:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:47348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1799249AbgJ0Pae (ORCPT ); Tue, 27 Oct 2020 11:30:34 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 674E022265; Tue, 27 Oct 2020 15:30:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603812634; bh=0f13yScvXC2xvmQdoHaI0DBKwtAdDrFoMcDQEpZ9IA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T66ptQRu7N79MmpnP6EoGPJXPNcE/VCeCzwDbyTE5XYQo2FlY+fd3IJTTxYCLT4KB XN4O2OCfJrSot3D7WiECGkhadJmgBuDr4Q+EgBo6uxMuXW+4YdICM+AT/k0mazp9Ui NEFBzTLmj8pQ+TljkYEOb+NvoUu2FFDJLpCF/8Pw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Abhinav Kumar , Jeykumar Sankaran , Jordan Crouse , Sean Paul , Stephen Boyd , Sai Prakash Ranjan , Rob Clark , Sasha Levin Subject: [PATCH 5.9 247/757] drm/msm: Avoid div-by-zero in dpu_crtc_atomic_check() Date: Tue, 27 Oct 2020 14:48:17 +0100 Message-Id: <20201027135502.171686496@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Boyd [ Upstream commit 22f760941844dbcee6ee446e1896532f6dff01ef ] 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 Cc: Jeykumar Sankaran Cc: Jordan Crouse Cc: Sean Paul Fixes: 25fdd5933e4c ("drm/msm: Add SDM845 DPU support") Signed-off-by: Stephen Boyd Reviewed-by: Abhinav Kumar Tested-by: Sai Prakash Ranjan Signed-off-by: Rob Clark Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index c2729f71e2fa7..f9cb1e0da1a59 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -881,7 +881,7 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, struct drm_plane *plane; struct drm_display_mode *mode; - int cnt = 0, rc = 0, mixer_width, i, z_pos; + int cnt = 0, rc = 0, mixer_width = 0, i, z_pos; struct dpu_multirect_plane_states multirect_plane[DPU_STAGE_MAX * 2]; int multirect_count = 0; @@ -914,9 +914,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, memset(pipe_staged, 0, sizeof(pipe_staged)); - mixer_width = mode->hdisplay / cstate->num_mixers; + if (cstate->num_mixers) { + mixer_width = mode->hdisplay / cstate->num_mixers; - _dpu_crtc_setup_lm_bounds(crtc, state); + _dpu_crtc_setup_lm_bounds(crtc, state); + } crtc_rect.x2 = mode->hdisplay; crtc_rect.y2 = mode->vdisplay; -- 2.25.1