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=-7.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_RHS_DOB,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 CC11EC04EB9 for ; Thu, 6 Dec 2018 14:44:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8178C20892 for ; Thu, 6 Dec 2018 14:44:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YnhfTfp3"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="uGawKfyY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8178C20892 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Qf1zC/Hr7pRk8QMrkKAWzaDyWya5z9IycDQDR84VQ1U=; b=YnhfTfp3rUw79+ J2vHXXRA1sRQmn2v048Gv6xM8GOVCq09FZ/gG4ZMY5UstnCBwj5BaitOfNXpHTpYe2HGkofAkp5OW i0HsBpulMxl444w75YlDDh1Bg1sBmOnMmhfqo5WdF6q5rcSyHk3sP/y7Xwj4cLoxprofexJoaMNFO w+QW35hX6tDs8VXldvBY2Hj7wSJvroOncTC/PEpERy6Zcrxqgnms2qcIEk2UEDm5OZsSlJbLcubdr 22umj5EDFwto/52nvYVuVdXkxRvhexje9jCHoh0ftA+DeVgo6gOnYGSSvisjg/JaAsbsJdbOz80cx QQxvaZOQeTGXlE+l/wXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUusd-0007bF-MQ; Thu, 06 Dec 2018 14:43:55 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUusZ-0007M7-MT; Thu, 06 Dec 2018 14:43:53 +0000 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 D2F562082B; Thu, 6 Dec 2018 14:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544107421; bh=cam+E+F7uqsaNknv2th6KtRUGoXkJ0sj0/ywuuWU0PM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uGawKfyYfk7LUl9d0b+AOv76lRdKqo6wwx2fQ4NiMTkaAoB0dfu8z0bJyOP0bRg0/ /CticpwDYlzwqqCLRB0B9J55PWtRXuF4HBJp6D1C9rpHzvNAMLf3hgQKfMzqyyFViQ Cvs7eNPwKLS/q6qiE6lAqr1QGKZZe5nphTaPHR/o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Subject: [PATCH 4.14 21/55] drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut() Date: Thu, 6 Dec 2018 15:38:55 +0100 Message-Id: <20181206143002.881189154@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206143001.749982936@linuxfoundation.org> References: <20181206143001.749982936@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181206_064351_776206_61549242 X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lyude Paul , Neil Armstrong , Maxime Ripard , Greg Kroah-Hartman , stable@vger.kernel.org, Sean Paul , dri-devel@lists.freedesktop.org, Kevin Hilman , Carlo Caione , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lyude Paul commit 97b2a3180a559a33852ac0cd77904166069484fd upstream. Currently on driver bringup with KASAN enabled, meson triggers an OOB memory access as shown below: [ 117.904528] ================================================================== [ 117.904560] BUG: KASAN: global-out-of-bounds in meson_viu_set_osd_lut+0x7a0/0x890 [ 117.904588] Read of size 4 at addr ffff20000a63ce24 by task systemd-udevd/498 [ 117.904601] [ 118.083372] CPU: 4 PID: 498 Comm: systemd-udevd Not tainted 4.20.0-rc3Lyude-Test+ #20 [ 118.091143] Hardware name: amlogic khadas-vim2/khadas-vim2, BIOS 2018.07-rc2-armbian 09/11/2018 [ 118.099768] Call trace: [ 118.102181] dump_backtrace+0x0/0x3e8 [ 118.105796] show_stack+0x14/0x20 [ 118.109083] dump_stack+0x130/0x1c4 [ 118.112539] print_address_description+0x60/0x25c [ 118.117214] kasan_report+0x1b4/0x368 [ 118.120851] __asan_report_load4_noabort+0x18/0x20 [ 118.125566] meson_viu_set_osd_lut+0x7a0/0x890 [ 118.129953] meson_viu_init+0x10c/0x290 [ 118.133741] meson_drv_bind_master+0x474/0x748 [ 118.138141] meson_drv_bind+0x10/0x18 [ 118.141760] try_to_bring_up_master+0x3d8/0x768 [ 118.146249] component_add+0x214/0x570 [ 118.149978] meson_dw_hdmi_probe+0x18/0x20 [meson_dw_hdmi] [ 118.155404] platform_drv_probe+0x98/0x138 [ 118.159455] really_probe+0x2a0/0xa70 [ 118.163070] driver_probe_device+0x1b4/0x2d8 [ 118.167299] __driver_attach+0x200/0x280 [ 118.171189] bus_for_each_dev+0x10c/0x1a8 [ 118.175144] driver_attach+0x38/0x50 [ 118.178681] bus_add_driver+0x330/0x608 [ 118.182471] driver_register+0x140/0x388 [ 118.186361] __platform_driver_register+0xc8/0x108 [ 118.191117] meson_dw_hdmi_platform_driver_init+0x1c/0x1000 [meson_dw_hdmi] [ 118.198022] do_one_initcall+0x12c/0x3bc [ 118.201883] do_init_module+0x1fc/0x638 [ 118.205673] load_module+0x4b4c/0x6808 [ 118.209387] __se_sys_init_module+0x2e8/0x3c0 [ 118.213699] __arm64_sys_init_module+0x68/0x98 [ 118.218100] el0_svc_common+0x104/0x210 [ 118.221893] el0_svc_handler+0x48/0xb8 [ 118.225594] el0_svc+0x8/0xc [ 118.228429] [ 118.229887] The buggy address belongs to the variable: [ 118.235007] eotf_33_linear_mapping+0x84/0xc0 [ 118.239301] [ 118.240752] Memory state around the buggy address: [ 118.245522] ffff20000a63cd00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 118.252695] ffff20000a63cd80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 118.259850] >ffff20000a63ce00: 00 00 00 00 04 fa fa fa fa fa fa fa 00 00 00 00 [ 118.267000] ^ [ 118.271222] ffff20000a63ce80: 00 fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00 [ 118.278393] ffff20000a63cf00: 00 00 00 00 00 00 00 00 00 00 00 00 04 fa fa fa [ 118.285542] ================================================================== [ 118.292699] Disabling lock debugging due to kernel taint It seems that when looping through the OSD EOTF LUT maps, we use the same max iterator for OETF: 20. This is wrong though, since 20*2 is 40, which means that we'll stop out of bounds on the EOTF maps. But, this whole thing is already confusing enough to read through as-is, so let's just replace all of the hardcoded sizes with OSD_(OETF/EOTF)_LUT_SIZE / 2. Signed-off-by: Lyude Paul Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Cc: Neil Armstrong Cc: Maxime Ripard Cc: Carlo Caione Cc: Kevin Hilman Cc: dri-devel@lists.freedesktop.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: # v4.10+ Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20181125012117.31915-1-lyude@redhat.com Signed-off-by: Sean Paul Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/meson/meson_viu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -184,18 +184,18 @@ void meson_viu_set_osd_lut(struct meson_ if (lut_sel == VIU_LUT_OSD_OETF) { writel(0, priv->io_base + _REG(addr_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(r_map[i * 2] | (r_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); writel(r_map[OSD_OETF_LUT_SIZE - 1] | (g_map[0] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(g_map[i * 2 + 1] | (g_map[i * 2 + 2] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(b_map[i * 2] | (b_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); @@ -211,18 +211,18 @@ void meson_viu_set_osd_lut(struct meson_ } else if (lut_sel == VIU_LUT_OSD_EOTF) { writel(0, priv->io_base + _REG(addr_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(r_map[i * 2] | (r_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); writel(r_map[OSD_EOTF_LUT_SIZE - 1] | (g_map[0] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(g_map[i * 2 + 1] | (g_map[i * 2 + 2] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(b_map[i * 2] | (b_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic 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=-7.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_RHS_DOB,USER_AGENT_GIT autolearn=unavailable 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 71DAFC04EB8 for ; Thu, 6 Dec 2018 14:44:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 411C620892 for ; Thu, 6 Dec 2018 14:44:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LNLTnHRE"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="uGawKfyY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 411C620892 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xkRG9MKOZg/vGWSH3aRgSFQ/znB+mztLQFmyXPqIQZw=; b=LNLTnHREl2WEfu yuObqF9s75NkABbKsLn6x4MmzN/rADJUSxoBmIMghO1HM5faUqqooI1dq738pUcVpnyI/+MLxp1Xw rkkN0nlM2cJ6Kc/PUKHx4TOTcpLCYwFX5Qf7ImHu514ekDJHmvTSa462IGBjyf/hAHEgJ8JVkdoZO F+gyI2O09mG6V5QeCsBhpBGMBpmNs03AAYOlOxw9uB2NHLYJNtaPgA1CYYhsC5ocrSIp2VovEDfkB SYO2rHdTJx87P7MnjH6EMUVFTdGtK0DD4cZU2fBmjdULSjHUPXVbscATcUcEB8nRMmAUn1TrLQ1Pn KXpM0kcliQRjGiVaA71Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUusg-0007cf-1o; Thu, 06 Dec 2018 14:43:58 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gUusZ-0007M7-MT; Thu, 06 Dec 2018 14:43:53 +0000 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 D2F562082B; Thu, 6 Dec 2018 14:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544107421; bh=cam+E+F7uqsaNknv2th6KtRUGoXkJ0sj0/ywuuWU0PM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uGawKfyYfk7LUl9d0b+AOv76lRdKqo6wwx2fQ4NiMTkaAoB0dfu8z0bJyOP0bRg0/ /CticpwDYlzwqqCLRB0B9J55PWtRXuF4HBJp6D1C9rpHzvNAMLf3hgQKfMzqyyFViQ Cvs7eNPwKLS/q6qiE6lAqr1QGKZZe5nphTaPHR/o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Subject: [PATCH 4.14 21/55] drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut() Date: Thu, 6 Dec 2018 15:38:55 +0100 Message-Id: <20181206143002.881189154@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206143001.749982936@linuxfoundation.org> References: <20181206143001.749982936@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181206_064351_776206_61549242 X-CRM114-Status: GOOD ( 10.55 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lyude Paul , Neil Armstrong , Maxime Ripard , Greg Kroah-Hartman , stable@vger.kernel.org, Sean Paul , dri-devel@lists.freedesktop.org, Kevin Hilman , Carlo Caione , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lyude Paul commit 97b2a3180a559a33852ac0cd77904166069484fd upstream. Currently on driver bringup with KASAN enabled, meson triggers an OOB memory access as shown below: [ 117.904528] ================================================================== [ 117.904560] BUG: KASAN: global-out-of-bounds in meson_viu_set_osd_lut+0x7a0/0x890 [ 117.904588] Read of size 4 at addr ffff20000a63ce24 by task systemd-udevd/498 [ 117.904601] [ 118.083372] CPU: 4 PID: 498 Comm: systemd-udevd Not tainted 4.20.0-rc3Lyude-Test+ #20 [ 118.091143] Hardware name: amlogic khadas-vim2/khadas-vim2, BIOS 2018.07-rc2-armbian 09/11/2018 [ 118.099768] Call trace: [ 118.102181] dump_backtrace+0x0/0x3e8 [ 118.105796] show_stack+0x14/0x20 [ 118.109083] dump_stack+0x130/0x1c4 [ 118.112539] print_address_description+0x60/0x25c [ 118.117214] kasan_report+0x1b4/0x368 [ 118.120851] __asan_report_load4_noabort+0x18/0x20 [ 118.125566] meson_viu_set_osd_lut+0x7a0/0x890 [ 118.129953] meson_viu_init+0x10c/0x290 [ 118.133741] meson_drv_bind_master+0x474/0x748 [ 118.138141] meson_drv_bind+0x10/0x18 [ 118.141760] try_to_bring_up_master+0x3d8/0x768 [ 118.146249] component_add+0x214/0x570 [ 118.149978] meson_dw_hdmi_probe+0x18/0x20 [meson_dw_hdmi] [ 118.155404] platform_drv_probe+0x98/0x138 [ 118.159455] really_probe+0x2a0/0xa70 [ 118.163070] driver_probe_device+0x1b4/0x2d8 [ 118.167299] __driver_attach+0x200/0x280 [ 118.171189] bus_for_each_dev+0x10c/0x1a8 [ 118.175144] driver_attach+0x38/0x50 [ 118.178681] bus_add_driver+0x330/0x608 [ 118.182471] driver_register+0x140/0x388 [ 118.186361] __platform_driver_register+0xc8/0x108 [ 118.191117] meson_dw_hdmi_platform_driver_init+0x1c/0x1000 [meson_dw_hdmi] [ 118.198022] do_one_initcall+0x12c/0x3bc [ 118.201883] do_init_module+0x1fc/0x638 [ 118.205673] load_module+0x4b4c/0x6808 [ 118.209387] __se_sys_init_module+0x2e8/0x3c0 [ 118.213699] __arm64_sys_init_module+0x68/0x98 [ 118.218100] el0_svc_common+0x104/0x210 [ 118.221893] el0_svc_handler+0x48/0xb8 [ 118.225594] el0_svc+0x8/0xc [ 118.228429] [ 118.229887] The buggy address belongs to the variable: [ 118.235007] eotf_33_linear_mapping+0x84/0xc0 [ 118.239301] [ 118.240752] Memory state around the buggy address: [ 118.245522] ffff20000a63cd00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 118.252695] ffff20000a63cd80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 118.259850] >ffff20000a63ce00: 00 00 00 00 04 fa fa fa fa fa fa fa 00 00 00 00 [ 118.267000] ^ [ 118.271222] ffff20000a63ce80: 00 fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00 [ 118.278393] ffff20000a63cf00: 00 00 00 00 00 00 00 00 00 00 00 00 04 fa fa fa [ 118.285542] ================================================================== [ 118.292699] Disabling lock debugging due to kernel taint It seems that when looping through the OSD EOTF LUT maps, we use the same max iterator for OETF: 20. This is wrong though, since 20*2 is 40, which means that we'll stop out of bounds on the EOTF maps. But, this whole thing is already confusing enough to read through as-is, so let's just replace all of the hardcoded sizes with OSD_(OETF/EOTF)_LUT_SIZE / 2. Signed-off-by: Lyude Paul Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Cc: Neil Armstrong Cc: Maxime Ripard Cc: Carlo Caione Cc: Kevin Hilman Cc: dri-devel@lists.freedesktop.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: # v4.10+ Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20181125012117.31915-1-lyude@redhat.com Signed-off-by: Sean Paul Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/meson/meson_viu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -184,18 +184,18 @@ void meson_viu_set_osd_lut(struct meson_ if (lut_sel == VIU_LUT_OSD_OETF) { writel(0, priv->io_base + _REG(addr_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(r_map[i * 2] | (r_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); writel(r_map[OSD_OETF_LUT_SIZE - 1] | (g_map[0] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(g_map[i * 2 + 1] | (g_map[i * 2 + 2] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(b_map[i * 2] | (b_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); @@ -211,18 +211,18 @@ void meson_viu_set_osd_lut(struct meson_ } else if (lut_sel == VIU_LUT_OSD_EOTF) { writel(0, priv->io_base + _REG(addr_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(r_map[i * 2] | (r_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); writel(r_map[OSD_EOTF_LUT_SIZE - 1] | (g_map[0] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(g_map[i * 2 + 1] | (g_map[i * 2 + 2] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(b_map[i * 2] | (b_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg Kroah-Hartman Subject: [PATCH 4.14 21/55] drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut() Date: Thu, 6 Dec 2018 15:38:55 +0100 Message-ID: <20181206143002.881189154@linuxfoundation.org> References: <20181206143001.749982936@linuxfoundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 715C66E5F3 for ; Thu, 6 Dec 2018 14:43:41 +0000 (UTC) In-Reply-To: <20181206143001.749982936@linuxfoundation.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: Neil Armstrong , Maxime Ripard , Greg Kroah-Hartman , stable@vger.kernel.org, Sean Paul , dri-devel@lists.freedesktop.org, Kevin Hilman , Carlo Caione , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org NC4xNC1zdGFibGUgcmV2aWV3IHBhdGNoLiAgSWYgYW55b25lIGhhcyBhbnkgb2JqZWN0aW9ucywg cGxlYXNlIGxldCBtZSBrbm93LgoKLS0tLS0tLS0tLS0tLS0tLS0tCgpGcm9tOiBMeXVkZSBQYXVs IDxseXVkZUByZWRoYXQuY29tPgoKY29tbWl0IDk3YjJhMzE4MGE1NTlhMzM4NTJhYzBjZDc3OTA0 MTY2MDY5NDg0ZmQgdXBzdHJlYW0uCgpDdXJyZW50bHkgb24gZHJpdmVyIGJyaW5ndXAgd2l0aCBL QVNBTiBlbmFibGVkLCBtZXNvbiB0cmlnZ2VycyBhbiBPT0IKbWVtb3J5IGFjY2VzcyBhcyBzaG93 biBiZWxvdzoKClsgIDExNy45MDQ1MjhdID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpbICAxMTcuOTA0NTYwXSBCVUc6IEtB U0FOOiBnbG9iYWwtb3V0LW9mLWJvdW5kcyBpbiBtZXNvbl92aXVfc2V0X29zZF9sdXQrMHg3YTAv MHg4OTAKWyAgMTE3LjkwNDU4OF0gUmVhZCBvZiBzaXplIDQgYXQgYWRkciBmZmZmMjAwMDBhNjNj ZTI0IGJ5IHRhc2sgc3lzdGVtZC11ZGV2ZC80OTgKWyAgMTE3LjkwNDYwMV0KWyAgMTE4LjA4MzM3 Ml0gQ1BVOiA0IFBJRDogNDk4IENvbW06IHN5c3RlbWQtdWRldmQgTm90IHRhaW50ZWQgNC4yMC4w LXJjM0x5dWRlLVRlc3QrICMyMApbICAxMTguMDkxMTQzXSBIYXJkd2FyZSBuYW1lOiBhbWxvZ2lj IGtoYWRhcy12aW0yL2toYWRhcy12aW0yLCBCSU9TIDIwMTguMDctcmMyLWFybWJpYW4gMDkvMTEv MjAxOApbICAxMTguMDk5NzY4XSBDYWxsIHRyYWNlOgpbICAxMTguMTAyMTgxXSAgZHVtcF9iYWNr dHJhY2UrMHgwLzB4M2U4ClsgIDExOC4xMDU3OTZdICBzaG93X3N0YWNrKzB4MTQvMHgyMApbICAx MTguMTA5MDgzXSAgZHVtcF9zdGFjaysweDEzMC8weDFjNApbICAxMTguMTEyNTM5XSAgcHJpbnRf YWRkcmVzc19kZXNjcmlwdGlvbisweDYwLzB4MjVjClsgIDExOC4xMTcyMTRdICBrYXNhbl9yZXBv cnQrMHgxYjQvMHgzNjgKWyAgMTE4LjEyMDg1MV0gIF9fYXNhbl9yZXBvcnRfbG9hZDRfbm9hYm9y dCsweDE4LzB4MjAKWyAgMTE4LjEyNTU2Nl0gIG1lc29uX3ZpdV9zZXRfb3NkX2x1dCsweDdhMC8w eDg5MApbICAxMTguMTI5OTUzXSAgbWVzb25fdml1X2luaXQrMHgxMGMvMHgyOTAKWyAgMTE4LjEz Mzc0MV0gIG1lc29uX2Rydl9iaW5kX21hc3RlcisweDQ3NC8weDc0OApbICAxMTguMTM4MTQxXSAg bWVzb25fZHJ2X2JpbmQrMHgxMC8weDE4ClsgIDExOC4xNDE3NjBdICB0cnlfdG9fYnJpbmdfdXBf bWFzdGVyKzB4M2Q4LzB4NzY4ClsgIDExOC4xNDYyNDldICBjb21wb25lbnRfYWRkKzB4MjE0LzB4 NTcwClsgIDExOC4xNDk5NzhdICBtZXNvbl9kd19oZG1pX3Byb2JlKzB4MTgvMHgyMCBbbWVzb25f ZHdfaGRtaV0KWyAgMTE4LjE1NTQwNF0gIHBsYXRmb3JtX2Rydl9wcm9iZSsweDk4LzB4MTM4Clsg IDExOC4xNTk0NTVdICByZWFsbHlfcHJvYmUrMHgyYTAvMHhhNzAKWyAgMTE4LjE2MzA3MF0gIGRy aXZlcl9wcm9iZV9kZXZpY2UrMHgxYjQvMHgyZDgKWyAgMTE4LjE2NzI5OV0gIF9fZHJpdmVyX2F0 dGFjaCsweDIwMC8weDI4MApbICAxMTguMTcxMTg5XSAgYnVzX2Zvcl9lYWNoX2RldisweDEwYy8w eDFhOApbICAxMTguMTc1MTQ0XSAgZHJpdmVyX2F0dGFjaCsweDM4LzB4NTAKWyAgMTE4LjE3ODY4 MV0gIGJ1c19hZGRfZHJpdmVyKzB4MzMwLzB4NjA4ClsgIDExOC4xODI0NzFdICBkcml2ZXJfcmVn aXN0ZXIrMHgxNDAvMHgzODgKWyAgMTE4LjE4NjM2MV0gIF9fcGxhdGZvcm1fZHJpdmVyX3JlZ2lz dGVyKzB4YzgvMHgxMDgKWyAgMTE4LjE5MTExN10gIG1lc29uX2R3X2hkbWlfcGxhdGZvcm1fZHJp dmVyX2luaXQrMHgxYy8weDEwMDAgW21lc29uX2R3X2hkbWldClsgIDExOC4xOTgwMjJdICBkb19v bmVfaW5pdGNhbGwrMHgxMmMvMHgzYmMKWyAgMTE4LjIwMTg4M10gIGRvX2luaXRfbW9kdWxlKzB4 MWZjLzB4NjM4ClsgIDExOC4yMDU2NzNdICBsb2FkX21vZHVsZSsweDRiNGMvMHg2ODA4ClsgIDEx OC4yMDkzODddICBfX3NlX3N5c19pbml0X21vZHVsZSsweDJlOC8weDNjMApbICAxMTguMjEzNjk5 XSAgX19hcm02NF9zeXNfaW5pdF9tb2R1bGUrMHg2OC8weDk4ClsgIDExOC4yMTgxMDBdICBlbDBf c3ZjX2NvbW1vbisweDEwNC8weDIxMApbICAxMTguMjIxODkzXSAgZWwwX3N2Y19oYW5kbGVyKzB4 NDgvMHhiOApbICAxMTguMjI1NTk0XSAgZWwwX3N2YysweDgvMHhjClsgIDExOC4yMjg0MjldClsg IDExOC4yMjk4ODddIFRoZSBidWdneSBhZGRyZXNzIGJlbG9uZ3MgdG8gdGhlIHZhcmlhYmxlOgpb ICAxMTguMjM1MDA3XSAgZW90Zl8zM19saW5lYXJfbWFwcGluZysweDg0LzB4YzAKWyAgMTE4LjIz OTMwMV0KWyAgMTE4LjI0MDc1Ml0gTWVtb3J5IHN0YXRlIGFyb3VuZCB0aGUgYnVnZ3kgYWRkcmVz czoKWyAgMTE4LjI0NTUyMl0gIGZmZmYyMDAwMGE2M2NkMDA6IDAwIDAwIDAwIDAwIDAwIDAwIDAw IDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwClsgIDExOC4yNTI2OTVdICBmZmZmMjAwMDBhNjNj ZDgwOiAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMApbICAx MTguMjU5ODUwXSA+ZmZmZjIwMDAwYTYzY2UwMDogMDAgMDAgMDAgMDAgMDQgZmEgZmEgZmEgZmEg ZmEgZmEgZmEgMDAgMDAgMDAgMDAKWyAgMTE4LjI2NzAwMF0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIF4KWyAgMTE4LjI3MTIyMl0gIGZmZmYyMDAwMGE2M2NlODA6IDAwIGZhIGZhIGZh IGZhIGZhIGZhIGZhIDAwIDAwIDAwIDAwIDAwIDAwIDAwIDAwClsgIDExOC4yNzgzOTNdICBmZmZm MjAwMDBhNjNjZjAwOiAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwMCAwNCBmYSBm YSBmYQpbICAxMTguMjg1NTQyXSA9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KWyAgMTE4LjI5MjY5OV0gRGlzYWJsaW5nIGxv Y2sgZGVidWdnaW5nIGR1ZSB0byBrZXJuZWwgdGFpbnQKCkl0IHNlZW1zIHRoYXQgd2hlbiBsb29w aW5nIHRocm91Z2ggdGhlIE9TRCBFT1RGIExVVCBtYXBzLCB3ZSB1c2UgdGhlCnNhbWUgbWF4IGl0 ZXJhdG9yIGZvciBPRVRGOiAyMC4gVGhpcyBpcyB3cm9uZyB0aG91Z2gsIHNpbmNlIDIwKjIgaXMg NDAsCndoaWNoIG1lYW5zIHRoYXQgd2UnbGwgc3RvcCBvdXQgb2YgYm91bmRzIG9uIHRoZSBFT1RG IG1hcHMuCgpCdXQsIHRoaXMgd2hvbGUgdGhpbmcgaXMgYWxyZWFkeSBjb25mdXNpbmcgZW5vdWdo IHRvIHJlYWQgdGhyb3VnaCBhcy1pcywKc28gbGV0J3MganVzdCByZXBsYWNlIGFsbCBvZiB0aGUg aGFyZGNvZGVkIHNpemVzIHdpdGgKT1NEXyhPRVRGL0VPVEYpX0xVVF9TSVpFIC8gMi4KClNpZ25l ZC1vZmYtYnk6IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhhdC5jb20+CkZpeGVzOiBiYmJlNzc1ZWM1 YjUgKCJkcm06IEFkZCBzdXBwb3J0IGZvciBBbWxvZ2ljIE1lc29uIEdyYXBoaWMgQ29udHJvbGxl ciIpCkNjOiBOZWlsIEFybXN0cm9uZyA8bmFybXN0cm9uZ0BiYXlsaWJyZS5jb20+CkNjOiBNYXhp bWUgUmlwYXJkIDxtYXhpbWUucmlwYXJkQGJvb3RsaW4uY29tPgpDYzogQ2FybG8gQ2Fpb25lIDxj YXJsb0BjYWlvbmUub3JnPgpDYzogS2V2aW4gSGlsbWFuIDxraGlsbWFuQGJheWxpYnJlLmNvbT4K Q2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKQ2M6IGxpbnV4LWFtbG9naWNAbGlz dHMuaW5mcmFkZWFkLm9yZwpDYzogbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3Jn CkNjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4gIyB2NC4xMCsKQWNrZWQtYnk6IE5laWwgQXJt c3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT4KU2lnbmVkLW9mZi1ieTogTmVpbCBBcm1z dHJvbmcgPG5hcm1zdHJvbmdAYmF5bGlicmUuY29tPgpMaW5rOiBodHRwczovL3BhdGNod29yay5m cmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxODExMjUwMTIxMTcuMzE5MTUtMS1seXVkZUBy ZWRoYXQuY29tClNpZ25lZC1vZmYtYnk6IFNlYW4gUGF1bCA8c2VhbnBhdWxAY2hyb21pdW0ub3Jn PgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRp b24ub3JnPgoKLS0tCiBkcml2ZXJzL2dwdS9kcm0vbWVzb24vbWVzb25fdml1LmMgfCAgIDEyICsr KysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMo LSkKCi0tLSBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl92aXUuYworKysgYi9kcml2ZXJz L2dwdS9kcm0vbWVzb24vbWVzb25fdml1LmMKQEAgLTE4NCwxOCArMTg0LDE4IEBAIHZvaWQgbWVz b25fdml1X3NldF9vc2RfbHV0KHN0cnVjdCBtZXNvbl8KIAlpZiAobHV0X3NlbCA9PSBWSVVfTFVU X09TRF9PRVRGKSB7CiAJCXdyaXRlbCgwLCBwcml2LT5pb19iYXNlICsgX1JFRyhhZGRyX3BvcnQp KTsKIAotCQlmb3IgKGkgPSAwOyBpIDwgMjA7IGkrKykKKwkJZm9yIChpID0gMDsgaSA8IChPU0Rf T0VURl9MVVRfU0laRSAvIDIpOyBpKyspCiAJCQl3cml0ZWwocl9tYXBbaSAqIDJdIHwgKHJfbWFw W2kgKiAyICsgMV0gPDwgMTYpLAogCQkJCXByaXYtPmlvX2Jhc2UgKyBfUkVHKGRhdGFfcG9ydCkp OwogCiAJCXdyaXRlbChyX21hcFtPU0RfT0VURl9MVVRfU0laRSAtIDFdIHwgKGdfbWFwWzBdIDw8 IDE2KSwKIAkJCXByaXYtPmlvX2Jhc2UgKyBfUkVHKGRhdGFfcG9ydCkpOwogCi0JCWZvciAoaSA9 IDA7IGkgPCAyMDsgaSsrKQorCQlmb3IgKGkgPSAwOyBpIDwgKE9TRF9PRVRGX0xVVF9TSVpFIC8g Mik7IGkrKykKIAkJCXdyaXRlbChnX21hcFtpICogMiArIDFdIHwgKGdfbWFwW2kgKiAyICsgMl0g PDwgMTYpLAogCQkJCXByaXYtPmlvX2Jhc2UgKyBfUkVHKGRhdGFfcG9ydCkpOwogCi0JCWZvciAo aSA9IDA7IGkgPCAyMDsgaSsrKQorCQlmb3IgKGkgPSAwOyBpIDwgKE9TRF9PRVRGX0xVVF9TSVpF IC8gMik7IGkrKykKIAkJCXdyaXRlbChiX21hcFtpICogMl0gfCAoYl9tYXBbaSAqIDIgKyAxXSA8 PCAxNiksCiAJCQkJcHJpdi0+aW9fYmFzZSArIF9SRUcoZGF0YV9wb3J0KSk7CiAKQEAgLTIxMSwx OCArMjExLDE4IEBAIHZvaWQgbWVzb25fdml1X3NldF9vc2RfbHV0KHN0cnVjdCBtZXNvbl8KIAl9 IGVsc2UgaWYgKGx1dF9zZWwgPT0gVklVX0xVVF9PU0RfRU9URikgewogCQl3cml0ZWwoMCwgcHJp di0+aW9fYmFzZSArIF9SRUcoYWRkcl9wb3J0KSk7CiAKLQkJZm9yIChpID0gMDsgaSA8IDIwOyBp KyspCisJCWZvciAoaSA9IDA7IGkgPCAoT1NEX0VPVEZfTFVUX1NJWkUgLyAyKTsgaSsrKQogCQkJ d3JpdGVsKHJfbWFwW2kgKiAyXSB8IChyX21hcFtpICogMiArIDFdIDw8IDE2KSwKIAkJCQlwcml2 LT5pb19iYXNlICsgX1JFRyhkYXRhX3BvcnQpKTsKIAogCQl3cml0ZWwocl9tYXBbT1NEX0VPVEZf TFVUX1NJWkUgLSAxXSB8IChnX21hcFswXSA8PCAxNiksCiAJCQlwcml2LT5pb19iYXNlICsgX1JF RyhkYXRhX3BvcnQpKTsKIAotCQlmb3IgKGkgPSAwOyBpIDwgMjA7IGkrKykKKwkJZm9yIChpID0g MDsgaSA8IChPU0RfRU9URl9MVVRfU0laRSAvIDIpOyBpKyspCiAJCQl3cml0ZWwoZ19tYXBbaSAq IDIgKyAxXSB8IChnX21hcFtpICogMiArIDJdIDw8IDE2KSwKIAkJCQlwcml2LT5pb19iYXNlICsg X1JFRyhkYXRhX3BvcnQpKTsKIAotCQlmb3IgKGkgPSAwOyBpIDwgMjA7IGkrKykKKwkJZm9yIChp ID0gMDsgaSA8IChPU0RfRU9URl9MVVRfU0laRSAvIDIpOyBpKyspCiAJCQl3cml0ZWwoYl9tYXBb aSAqIDJdIHwgKGJfbWFwW2kgKiAyICsgMV0gPDwgMTYpLAogCQkJCXByaXYtPmlvX2Jhc2UgKyBf UkVHKGRhdGFfcG9ydCkpOwogCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCg== 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=-7.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,URIBL_RHS_DOB,USER_AGENT_GIT autolearn=unavailable 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 00D83C04EB8 for ; Thu, 6 Dec 2018 14:56:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFBE220700 for ; Thu, 6 Dec 2018 14:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544108174; bh=cam+E+F7uqsaNknv2th6KtRUGoXkJ0sj0/ywuuWU0PM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yp/R559r0IBqvvP50eaiktVfH9NsdqTEZTc90sIT4xuxtL3vQy/c1Gza+MJmXWO9M zk4q0bI2hQsHd6NzdZ7MB+ytwyQvMGKeflqSkix1fc5PcebSk1KQMt2rX0bAX+q9dA /70y2gLNM0mwc+I150gTJAf+CMBDZkg81830sL8g= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFBE220700 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726360AbeLFO4N (ORCPT ); Thu, 6 Dec 2018 09:56:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:48184 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730712AbeLFOnm (ORCPT ); Thu, 6 Dec 2018 09:43:42 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 D2F562082B; Thu, 6 Dec 2018 14:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544107421; bh=cam+E+F7uqsaNknv2th6KtRUGoXkJ0sj0/ywuuWU0PM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uGawKfyYfk7LUl9d0b+AOv76lRdKqo6wwx2fQ4NiMTkaAoB0dfu8z0bJyOP0bRg0/ /CticpwDYlzwqqCLRB0B9J55PWtRXuF4HBJp6D1C9rpHzvNAMLf3hgQKfMzqyyFViQ Cvs7eNPwKLS/q6qiE6lAqr1QGKZZe5nphTaPHR/o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lyude Paul , Neil Armstrong , Maxime Ripard , Carlo Caione , Kevin Hilman , dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Sean Paul Subject: [PATCH 4.14 21/55] drm/meson: Fix OOB memory accesses in meson_viu_set_osd_lut() Date: Thu, 6 Dec 2018 15:38:55 +0100 Message-Id: <20181206143002.881189154@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206143001.749982936@linuxfoundation.org> References: <20181206143001.749982936@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lyude Paul commit 97b2a3180a559a33852ac0cd77904166069484fd upstream. Currently on driver bringup with KASAN enabled, meson triggers an OOB memory access as shown below: [ 117.904528] ================================================================== [ 117.904560] BUG: KASAN: global-out-of-bounds in meson_viu_set_osd_lut+0x7a0/0x890 [ 117.904588] Read of size 4 at addr ffff20000a63ce24 by task systemd-udevd/498 [ 117.904601] [ 118.083372] CPU: 4 PID: 498 Comm: systemd-udevd Not tainted 4.20.0-rc3Lyude-Test+ #20 [ 118.091143] Hardware name: amlogic khadas-vim2/khadas-vim2, BIOS 2018.07-rc2-armbian 09/11/2018 [ 118.099768] Call trace: [ 118.102181] dump_backtrace+0x0/0x3e8 [ 118.105796] show_stack+0x14/0x20 [ 118.109083] dump_stack+0x130/0x1c4 [ 118.112539] print_address_description+0x60/0x25c [ 118.117214] kasan_report+0x1b4/0x368 [ 118.120851] __asan_report_load4_noabort+0x18/0x20 [ 118.125566] meson_viu_set_osd_lut+0x7a0/0x890 [ 118.129953] meson_viu_init+0x10c/0x290 [ 118.133741] meson_drv_bind_master+0x474/0x748 [ 118.138141] meson_drv_bind+0x10/0x18 [ 118.141760] try_to_bring_up_master+0x3d8/0x768 [ 118.146249] component_add+0x214/0x570 [ 118.149978] meson_dw_hdmi_probe+0x18/0x20 [meson_dw_hdmi] [ 118.155404] platform_drv_probe+0x98/0x138 [ 118.159455] really_probe+0x2a0/0xa70 [ 118.163070] driver_probe_device+0x1b4/0x2d8 [ 118.167299] __driver_attach+0x200/0x280 [ 118.171189] bus_for_each_dev+0x10c/0x1a8 [ 118.175144] driver_attach+0x38/0x50 [ 118.178681] bus_add_driver+0x330/0x608 [ 118.182471] driver_register+0x140/0x388 [ 118.186361] __platform_driver_register+0xc8/0x108 [ 118.191117] meson_dw_hdmi_platform_driver_init+0x1c/0x1000 [meson_dw_hdmi] [ 118.198022] do_one_initcall+0x12c/0x3bc [ 118.201883] do_init_module+0x1fc/0x638 [ 118.205673] load_module+0x4b4c/0x6808 [ 118.209387] __se_sys_init_module+0x2e8/0x3c0 [ 118.213699] __arm64_sys_init_module+0x68/0x98 [ 118.218100] el0_svc_common+0x104/0x210 [ 118.221893] el0_svc_handler+0x48/0xb8 [ 118.225594] el0_svc+0x8/0xc [ 118.228429] [ 118.229887] The buggy address belongs to the variable: [ 118.235007] eotf_33_linear_mapping+0x84/0xc0 [ 118.239301] [ 118.240752] Memory state around the buggy address: [ 118.245522] ffff20000a63cd00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 118.252695] ffff20000a63cd80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 118.259850] >ffff20000a63ce00: 00 00 00 00 04 fa fa fa fa fa fa fa 00 00 00 00 [ 118.267000] ^ [ 118.271222] ffff20000a63ce80: 00 fa fa fa fa fa fa fa 00 00 00 00 00 00 00 00 [ 118.278393] ffff20000a63cf00: 00 00 00 00 00 00 00 00 00 00 00 00 04 fa fa fa [ 118.285542] ================================================================== [ 118.292699] Disabling lock debugging due to kernel taint It seems that when looping through the OSD EOTF LUT maps, we use the same max iterator for OETF: 20. This is wrong though, since 20*2 is 40, which means that we'll stop out of bounds on the EOTF maps. But, this whole thing is already confusing enough to read through as-is, so let's just replace all of the hardcoded sizes with OSD_(OETF/EOTF)_LUT_SIZE / 2. Signed-off-by: Lyude Paul Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Cc: Neil Armstrong Cc: Maxime Ripard Cc: Carlo Caione Cc: Kevin Hilman Cc: dri-devel@lists.freedesktop.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org Cc: # v4.10+ Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/20181125012117.31915-1-lyude@redhat.com Signed-off-by: Sean Paul Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/meson/meson_viu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -184,18 +184,18 @@ void meson_viu_set_osd_lut(struct meson_ if (lut_sel == VIU_LUT_OSD_OETF) { writel(0, priv->io_base + _REG(addr_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(r_map[i * 2] | (r_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); writel(r_map[OSD_OETF_LUT_SIZE - 1] | (g_map[0] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(g_map[i * 2 + 1] | (g_map[i * 2 + 2] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_OETF_LUT_SIZE / 2); i++) writel(b_map[i * 2] | (b_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); @@ -211,18 +211,18 @@ void meson_viu_set_osd_lut(struct meson_ } else if (lut_sel == VIU_LUT_OSD_EOTF) { writel(0, priv->io_base + _REG(addr_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(r_map[i * 2] | (r_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port)); writel(r_map[OSD_EOTF_LUT_SIZE - 1] | (g_map[0] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(g_map[i * 2 + 1] | (g_map[i * 2 + 2] << 16), priv->io_base + _REG(data_port)); - for (i = 0; i < 20; i++) + for (i = 0; i < (OSD_EOTF_LUT_SIZE / 2); i++) writel(b_map[i * 2] | (b_map[i * 2 + 1] << 16), priv->io_base + _REG(data_port));