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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 0FF85C433E1 for ; Thu, 20 Aug 2020 10:31:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA26720658 for ; Thu, 20 Aug 2020 10:31:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597919505; bh=ZzqLaqW48l/4hRln/x8+EwmEHc5lQTyYnJO4GEmknOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kNcq1LL2XdY67X/SPCoM+6NJl0lQFFRK0PRueYLSExahtv7sAipDdkk6f8lUx8vYI J3uxA130IpuRMQzlwbpCf230XaL0xA76nmG+shQ4Va+CGHkMjs60mt1KJp40kqfnfr WWge5T4ydQzf6LJypi6ZFCNJCS5HvWvQ2MF6+o94= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730468AbgHTKbn (ORCPT ); Thu, 20 Aug 2020 06:31:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:45930 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731477AbgHTKUh (ORCPT ); Thu, 20 Aug 2020 06:20:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 6149D20658; Thu, 20 Aug 2020 10:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597918836; bh=ZzqLaqW48l/4hRln/x8+EwmEHc5lQTyYnJO4GEmknOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wm68BIVhLc/3cGgfVaNYxB0O8Rm1vi5bkPNrvuCV/Nm0B9KAwF1I/EIVqFEhnt2Cq WWph0RLntRbNE0fJPHvhvKBGL6EsLmIZiQVnMuFFB/uJB947jKPV0WirLEMt+Ndv6q oRKgc3HIoNn93+OQzQFSFkAms+r8OMZNktxR3Wf4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Alex Deucher , Sasha Levin Subject: [PATCH 4.4 085/149] drm/radeon: fix array out-of-bounds read and write issues Date: Thu, 20 Aug 2020 11:22:42 +0200 Message-Id: <20200820092129.840801643@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820092125.688850368@linuxfoundation.org> References: <20200820092125.688850368@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Colin Ian King [ Upstream commit 7ee78aff9de13d5dccba133f4a0de5367194b243 ] There is an off-by-one bounds check on the index into arrays table->mc_reg_address and table->mc_reg_table_entry[k].mc_data[j] that can lead to reads and writes outside of arrays. Fix the bound checking off-by-one error. Addresses-Coverity: ("Out-of-bounds read/write") Fixes: cc8dbbb4f62a ("drm/radeon: add dpm support for CI dGPUs (v2)") Signed-off-by: Colin Ian King Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/ci_dpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c index e7a245d7bdbcb..8e1bf9ed8efff 100644 --- a/drivers/gpu/drm/radeon/ci_dpm.c +++ b/drivers/gpu/drm/radeon/ci_dpm.c @@ -4345,7 +4345,7 @@ static int ci_set_mc_special_registers(struct radeon_device *rdev, table->mc_reg_table_entry[k].mc_data[j] |= 0x100; } j++; - if (j > SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE) + if (j >= SMU7_DISCRETE_MC_REGISTER_ARRAY_SIZE) return -EINVAL; if (!pi->mem_gddr5) { -- 2.25.1