Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp236226ybg; Thu, 17 Oct 2019 22:07:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqxV4jmqaqbNy8jt7M7Ad4Zdyvin7s6njN9T7YCi1yM2k1Vh7LD58ht91ot5dj9cH0P/ED5E X-Received: by 2002:a17:907:39b:: with SMTP id ss27mr6745873ejb.151.1571375269521; Thu, 17 Oct 2019 22:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375269; cv=none; d=google.com; s=arc-20160816; b=REkQdhU5TbvNbL4i5PKNZIUCjPkIQFu4/p7vV0h7gMvVO0R8L4qcShvfcZObNeJ4hf wh9luMYNjJDw28BcrLUEaimZ52UZ3urkH7om+dYkZYwTKoX1zUzP+vqedJYKauQXW2Lq AVW7sF+zrotQoeTiWJF2DHvc4ZAiy3O7Zu1Umqn3ptHBN5cMzXdKbnBmGSW/O35OQEnO P6qGIzaYDcpOpwiE+LqYTsnK0v9vga+dR8igH4FP0trsKfKSl7xRztfQ83a5wpttuLPT I33555JjEkf6VIikCxGeRgZ7CkwtUxKOE6t9/G6ccRpIOzWhkA5K74a6SInojTp6lorH G96Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=N6c2qfz/6ZVFiwQuhcAx3UfXVlTDQ8ZDISgo0wQbk+M=; b=X4uSF5ZPVHIwTpruriGO2wML9cIjGgZOAFL2iTM+BHaUXyE/UrxyhBIOP2BjMwUNAk JvZ0s8NZ4jJLqVOwz0oavouPrAWwOPg3mYWrRw5zZGSX+dZ7cTKF15UY0GHS49bVEToa D7CoJ3TL9+mm9F22TnDT9ahWYGmgdComUHe+qFeT0jHvmHnRmNTc3UdJquRiCD/DocbB OV8/BhQDEVMKPT6hbPkQZRxVsmdIAp+3/TMssw8VeguTptSeHE3srhjDgR8E/fPa8o16 oyWIJ0beiBi59Wr3yGbDJa4vPKah+H7A9TH1QR1goL8vS3P61Er0pCXkPTGvJopkJEdd GP6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VCjSp+gV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z10si2624503ejp.397.2019.10.17.22.07.26; Thu, 17 Oct 2019 22:07:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VCjSp+gV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390559AbfJPWX1 (ORCPT + 99 others); Wed, 16 Oct 2019 18:23:27 -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