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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C20D6C25B0C for ; Thu, 11 Aug 2022 15:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235344AbiHKPdE (ORCPT ); Thu, 11 Aug 2022 11:33:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235023AbiHKPcO (ORCPT ); Thu, 11 Aug 2022 11:32:14 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 012BF95E5D; Thu, 11 Aug 2022 08:31:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 49678CE223C; Thu, 11 Aug 2022 15:31:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A9F0C433D6; Thu, 11 Aug 2022 15:31:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660231877; bh=u1SmrcJOyhdPI0vX1TAyDu5DiJDhV/2N6ZrC90DXkn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lf4WO2nIElJNueg+v6O5LbHbExH3X18vlyAydlH1XmvhSimtc5xOsdWYfbcVxYWks Z2hS9GmPrtYz9vm62oqQZC0cYgTo8k6aFFm4K/WAoJtKjI+m6BuNOOz1wjPC3/gZ0A bclaiFf8FoYHvIBEKo/LPpEzey87GJS5i4FAXcgv1DcKIemTVBgO4ymUMha7+Hp+Pp CsZozeDs7SfBrIAwuAoguh07PNI2bU8/Qxg+HbtPkKStfsQaYo3nEguRzoYRsc3h5Q ZUzu67BLxqlsPgj6ndKmiJbFLh4EAV7Hmsr3y0ezDFja1gB4NrS+wIEGr+sKvhYsF7 35PxXbZCdL2Hw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiaohui Zhang , Alex Deucher , Sasha Levin , christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@linux.ie, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.19 019/105] drm/radeon: integer overflow in radeon_mode_dumb_create() Date: Thu, 11 Aug 2022 11:27:03 -0400 Message-Id: <20220811152851.1520029-19-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811152851.1520029-1-sashal@kernel.org> References: <20220811152851.1520029-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiaohui Zhang [ Upstream commit feb54650bae25f2a2adfc493e3e254e7c27a3fba ] Similar to the handling of amdgpu_mode_dumb_create in commit 54ef0b5461c0 ("drm/amdgpu: integer overflow in amdgpu_mode_dumb_create()"), we thought a patch might be needed here as well. args->size is a u64. arg->pitch and args->height are u32. The multiplication will overflow instead of using the high 32 bits as intended. Signed-off-by: Xiaohui Zhang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index 8c01a7f0e027..84843b3b3aef 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -833,7 +833,7 @@ int radeon_mode_dumb_create(struct drm_file *file_priv, args->pitch = radeon_align_pitch(rdev, args->width, DIV_ROUND_UP(args->bpp, 8), 0); - args->size = args->pitch * args->height; + args->size = (u64)args->pitch * args->height; args->size = ALIGN(args->size, PAGE_SIZE); r = radeon_gem_object_create(rdev, args->size, 0, -- 2.35.1