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=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 3D31FC4360C for ; Thu, 10 Oct 2019 08:42:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1542F22480 for ; Thu, 10 Oct 2019 08:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570696934; bh=67alXanO7YCIs4Cnpue3J69QNuYSm8158GPO0Zhsjto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=veO130/7DWqSkkVftoLb0GTb1tmHvXDopr14rXdIHrdJbZAcKksBSSH/Wmr1XjAxN uUzX1bT+i8o49I1pZrBUF25uFYblvFXxwXKzovpPARsW/NkaTDasssuMKUCgPDo252 SDUPyInv1IMDVGQKHkOEmo5ah4j08r6jnmwnrGEM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388496AbfJJImM (ORCPT ); Thu, 10 Oct 2019 04:42:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:46730 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388494AbfJJImL (ORCPT ); Thu, 10 Oct 2019 04:42:11 -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 AA0102190F; Thu, 10 Oct 2019 08:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570696931; bh=67alXanO7YCIs4Cnpue3J69QNuYSm8158GPO0Zhsjto=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QcEymdV8TKr927JjQAxx2tPv5HNcT6xEJB5xcGTEGoyDrvdkcJuVv3e01brHdglwq ZvftmJpqHWkLa5JiimWb1b86lmg3SxkE/Mf1Jf/tNJGyTKMFUf1EwyBtKNmbXAKvK3 H7oMWN//S2I5dIkItLwm/BfmaW+xDqrgvaNdIKr8= 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 5.3 105/148] drm/amdgpu: Check for valid number of registers to read Date: Thu, 10 Oct 2019 10:36:06 +0200 Message-Id: <20191010083617.557758906@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010083609.660878383@linuxfoundation.org> References: <20191010083609.660878383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 0cf7e8606fd3d..00beba533582c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -662,6 +662,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