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 8B725C3F6B0 for ; Thu, 11 Aug 2022 15:53:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236942AbiHKPxz (ORCPT ); Thu, 11 Aug 2022 11:53:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235785AbiHKPx1 (ORCPT ); Thu, 11 Aug 2022 11:53:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D0B49A9AC; Thu, 11 Aug 2022 08:44:53 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 78BAD616C5; Thu, 11 Aug 2022 15:44:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8333AC433D6; Thu, 11 Aug 2022 15:44:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660232691; bh=PA5jr6Zg6+pynnUSqe+ntVqnjUHlszGQ1Oc0fAX6TVY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xrp7za6e9Y0S/wFtD1jHtXy/5G56qA9kjdGkwxaiPuP4DPckoSHigdwegvB49MFu+ fC3scNbQfZq3WNXdF5Xy0gVfJobtkteSEJQBwxT2YKuLuObtZg2V0K0SqfgDPVNc7C BcKPu3OH7wF7vYgi//QqxqKzVsVnzPc389Tu7zp4n0JibNdEiXls7tmicSGhHQLESX BLIMp3g6ntKBYNm0inGHj7YlQW482Eb5xwYT4WffaRqTwxGQBm2QzpYp7Cw/8FkviM iXVBTdYnSg6v3CiY/SVkeJL3worlf+sXwtVWR83ZzVc17Z41s8bT/Ezpm2VjdLUZi/ EcN1qZCs7TrqA== 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.18 18/93] drm/radeon: integer overflow in radeon_mode_dumb_create() Date: Thu, 11 Aug 2022 11:41:12 -0400 Message-Id: <20220811154237.1531313-18-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811154237.1531313-1-sashal@kernel.org> References: <20220811154237.1531313-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: stable@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 f563284a7fac..6c9cc0061a8d 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -830,7 +830,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