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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 156F9ECE587 for ; Tue, 1 Oct 2019 16:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4A7720659 for ; Tue, 1 Oct 2019 16:46:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948405; bh=gOxfJOCLf60/pIqvNXNUkBT5bw2/Po247341M7g2E6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VN0+kSLmQexQ+uvPPWJMXHSZ3A/1VB3LsBygiNPDzga0uEy84v5S0rbNn+CyQ2z0i +PpmklJ1tmwGy11/bLi/9+IMOZp8HzEaIbz29B7kB7bxDIRJ6UneM6rjV9bYgf1V6O U3stxsmese6HJ05G4zzVYNWSOdeMJTRe7ZjSjKk8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733176AbfJAQqo (ORCPT ); Tue, 1 Oct 2019 12:46:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:58280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390370AbfJAQpm (ORCPT ); Tue, 1 Oct 2019 12:45:42 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1D10220B7C; Tue, 1 Oct 2019 16:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948341; bh=gOxfJOCLf60/pIqvNXNUkBT5bw2/Po247341M7g2E6k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZgMm5IH5eLW4pnGxmdgJTNAL6UqmHEnyJLbWs8Pp307w6Wk4B6K1Cqu5Ko4EXxOqe 1IsNraRHE/4acnkJ9yGs0WCGBNb/N6xzQ3CyA8Lu/AaU4H589KEh/G5/h5vnNk33Ky Y284QML/ZNImaHFqLapEJcGJItVm+ZfhW8fy2oTM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Trek , Alex Deucher , Sasha Levin , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.4 06/15] drm/amdgpu: Check for valid number of registers to read Date: Tue, 1 Oct 2019 12:45:24 -0400 Message-Id: <20191001164533.16915-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001164533.16915-1-sashal@kernel.org> References: <20191001164533.16915-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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