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=-9.8 required=3.0 tests=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=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 11D52ECE599 for ; Wed, 16 Oct 2019 22:23:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D94C321848 for ; Wed, 16 Oct 2019 22:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571264616; bh=gOxfJOCLf60/pIqvNXNUkBT5bw2/Po247341M7g2E6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l6lGT5ob8yJkkElH0FGp9lDTJ6BFH5rLnhfJ33WYavtiNsdLEUOzdTKRT73cRKo44 vVdL5uh0wrm9oa8pzeCLZYGTVUNFgaEihP2kChYngHX+MU4uL7Jtx2YKKWCQPl4cAn qk4R3f3U/hb/0NNk2oew8Wmut+QMkF3jkgD0C3LE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439417AbfJPWX2 (ORCPT ); Wed, 16 Oct 2019 18:23:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:41398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437043AbfJPVw4 (ORCPT ); Wed, 16 Oct 2019 17:52:56 -0400 Received: from localhost (unknown [192.55.54.58]) (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 2F96A218DE; Wed, 16 Oct 2019 21:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262776; bh=gOxfJOCLf60/pIqvNXNUkBT5bw2/Po247341M7g2E6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VCjSp+gVjviT6E8ItEovLIgzzGJnzlI8x3nBZcrdYolTnQ9RoMsWUv2sa6OUKvBZL 8muu/jIIUYmn2lem5MMqkIz88YPDN0Ikn36TlNrsMswmlTr8Xqryjr3RrKSzI6Tfr/ w64WFuk9AmYF7/JOqlheIyq2O8DOpynYBWori4G0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Trek , Alex Deucher , Sasha Levin Subject: [PATCH 4.4 17/79] drm/amdgpu: Check for valid number of registers to read Date: Wed, 16 Oct 2019 14:49:52 -0700 Message-Id: <20191016214746.435033052@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@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: Trek [ Upstream commit 73d8e6c7b841d9bf298c8928f228fb433676635c ] Do not try to allocate any amount of memory requested by the user. Instead limit it to 128 registers. Actually the longest series of consecutive allowed registers are 48, mmGB_TILE_MODE0-31 and mmGB_MACROTILE_MODE0-15 (0x2644-0x2673). Bug: https://bugs.freedesktop.org/show_bug.cgi?id=111273 Signed-off-by: Trek Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index a5c8240784726..e35e603710b4d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -406,6 +406,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file if (sh_num == AMDGPU_INFO_MMR_SH_INDEX_MASK) sh_num = 0xffffffff; + if (info->read_mmr_reg.count > 128) + return -EINVAL; + regs = kmalloc_array(info->read_mmr_reg.count, sizeof(*regs), GFP_KERNEL); if (!regs) return -ENOMEM; -- 2.20.1