From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63583C352A3 for ; Mon, 10 Feb 2020 12:35:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3397820842 for ; Mon, 10 Feb 2020 12:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338154; bh=MZzaPF918fcnYMDkywvRaK4a8r4Ai+0JtuwlN0iSxx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nroe0th84fimfTHnvTwg6Oj4FUpxjKTi8R4x97Rjwe8KlJLDboL1XAflTXanTDhuV 8EtROth0bkwbai4ZMuHcNTUfq3bqA/iMblheqDYtgbSmLGkVyiXoZ1KlRwjPLWPc72 Jw76peVXwHweDKjlV+tlV+TmRF1sO8GqygLAgGo8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728154AbgBJMfw (ORCPT ); Mon, 10 Feb 2020 07:35:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:53642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728147AbgBJMfw (ORCPT ); Mon, 10 Feb 2020 07:35:52 -0500 Received: from localhost (unknown [209.37.97.194]) (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 BF8E52080C; Mon, 10 Feb 2020 12:35:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338151; bh=MZzaPF918fcnYMDkywvRaK4a8r4Ai+0JtuwlN0iSxx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gGOHtIoyDTMCDFNSWO3Uq9BX/Y1Sun/Ni37D7xPY7zCvdxBFjd/D5rCIKRljL0+aa fSp0FxhW7cfSvbZxGM5wViHz+XpqXhI4T1VRg2Wxg/njx9JGpMmKA73Pf9l5unfn31 3j3y6v+3PjuyB2+TnOBrjHtXGCWgBaZppFqwTPpo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Maarten Lankhorst , Benjamin Gaignard , Daniel Vetter , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Daniel Vetter Subject: [PATCH 4.19 115/195] drm/rect: Avoid division by zero Date: Mon, 10 Feb 2020 04:32:53 -0800 Message-Id: <20200210122316.679926513@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122305.731206734@linuxfoundation.org> References: <20200210122305.731206734@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ville Syrjälä commit 433480c1afd44f3e1e664b85063d98cefeefa0ed upstream. Check for zero width/height destination rectangle in drm_rect_clip_scaled() to avoid a division by zero. Cc: stable@vger.kernel.org Fixes: f96bdf564f3e ("drm/rect: Handle rounding errors in drm_rect_clip_scaled, v3.") Cc: Maarten Lankhorst Cc: Benjamin Gaignard Cc: Daniel Vetter Testcase: igt/kms_selftest/drm_rect_clip_scaled_div_by_zero Signed-off-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20191122175623.13565-2-ville.syrjala@linux.intel.com Reviewed-by: Daniel Vetter Reviewed-by: Benjamin Gaignard Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_rect.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/drm_rect.c +++ b/drivers/gpu/drm/drm_rect.c @@ -52,7 +52,12 @@ EXPORT_SYMBOL(drm_rect_intersect); static u32 clip_scaled(u32 src, u32 dst, u32 clip) { - u64 tmp = mul_u32_u32(src, dst - clip); + u64 tmp; + + if (dst == 0) + return 0; + + tmp = mul_u32_u32(src, dst - clip); /* * Round toward 1.0 when clipping so that we don't accidentally