Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp2084192ybp; Thu, 10 Oct 2019 01:54:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqyiiKeMZO7R/I1X5nnH61whpDtuHAl5p3mxeBQE984HzfVagINTqWTdT/vyyWjKGg5av0U9 X-Received: by 2002:a17:906:11d8:: with SMTP id o24mr7051741eja.224.1570697699086; Thu, 10 Oct 2019 01:54:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570697699; cv=none; d=google.com; s=arc-20160816; b=aDqyeupNnyEsi8tAplO5YiDowqldeZmBzYNtLJtUe/jaTMaz3jZvAlNfTZ2VC+wZWG W52qu+gdg9KeYGPI2cfx+MPb6O6ise0tdV3FuR52DKhW4JJENxEbTCvqRVLjwUdyIw5C 9A142rxziRxepAPY0Pza+xdokD1exI+0sY56Gjd0h6eu9CPOugi6D5CgZI2JjYPn3sYD DnqFSkiQxn6pGV2+bNPZJJp2V5eccpQru61DtdcdJJaHtCYzMSqcvamHZPU4anrRNvPV vDydgyEVXAIb71BmB6TTYbP+ngPtoj82m4+f99cBreIjAYLzzx36MOMkome427p+x3j4 zFQQ== 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=cn28FfRoetpxPotjmJzNJvnsD3KFhzlEFpzVBi9M7+4=; b=jtNva/HhsWsTclVZMd3EzeywDUUFupwsVH8b/M0rq/g+DHTS/o7MyvfyxO9DS+stWn zEVlYY/rfcCMZQCn82uamvv9XV9CYjxaEqs9v8WDIjcYQ5eL/JuHZpL9OhCGD83vlSA9 IeeWzBggS5nE53NYzq3zjwpsf+yIlhTIHXXgZSz5Og1MbGxCaLEE/ViKavKS0nsNqzYh hRzyvjYyxnYtddXVSSiMGnU67aovMezcO/PfOAWhmCzgiXVlDT01eBKt6hEMWHP5WviR VjV2BDlJod/WzbHrrD+k8JXSxDwHqTD/e9pRQ9q1FZPcN/uRiBgkqzT1V6MdUuMKgTRg 0oQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="K/OMYc5g"; 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 l20si2680944ejb.111.2019.10.10.01.54.35; Thu, 10 Oct 2019 01:54:59 -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="K/OMYc5g"; 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 S2389645AbfJJIvD (ORCPT + 99 others); Thu, 10 Oct 2019 04:51:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:58342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390057AbfJJIvB (ORCPT ); Thu, 10 Oct 2019 04:51:01 -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 DCC3821D71; Thu, 10 Oct 2019 08:50:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570697460; bh=bUeR3G4ltMyhjy1E4Dp4Np7mZiJmRIOpqJtRyynAjLA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K/OMYc5gO3PW3fqiQWFPooG8fjECX3P3EJfMRtjk16N/Vnr4FoQze6iHA6ajM0Dqc 9WAh5AvPkliOBRqZi9VdfSUe1nmcw+teTrq+9tDwYFMxhJfo1g1VIh9OnKgHKBUQIA rn2KRwso3RdBGYuBPdD2kKeoagbmTSltAqBmI7tU= 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.14 36/61] drm/amdgpu: Check for valid number of registers to read Date: Thu, 10 Oct 2019 10:37:01 +0200 Message-Id: <20191010083512.929771258@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010083449.500442342@linuxfoundation.org> References: <20191010083449.500442342@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 e16229000a983..884ed359f2493 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -540,6 +540,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