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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D740EC19F2A for ; Thu, 11 Aug 2022 16:10:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BAA2F8DFE1; Thu, 11 Aug 2022 16:10:30 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29E6A14AD18; Thu, 11 Aug 2022 16:09:54 +0000 (UTC) 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 0919061422; Thu, 11 Aug 2022 16:09:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60D42C433D7; Thu, 11 Aug 2022 16:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660234193; bh=ffimnvJVit0Fcg4L295RnW58dCDMi4o1Jun9ClMnSQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXIwHui1GAqc9/fYz0GU5tws5ibIGYOdFlrpeOdSpDMO3BgsFWtKbA1D+bCKfPUJ1 X5V6tA4OTyRm4JCYzr9Lvs2BGZZX+cmUtiEHkfrQC8k3x1Z3lsyJie3QlQVfo4YCFu 09+g6ctgiStGyfhIzEUtwRCBwU//v/THb6frWVqskKecticbVeN3o2LT8aZSbOGk46 wP0zbgmx64c/SN3+zrYRVeGnnIp2aopH4kO8mq7WsIu5J0Ddyi41cjTdlhNGoazS4l 9tS+u5Oew63EF/1jfnrsOmVliSA42oa5W1/47dGvNqiep0LcycfXbNUWY2BOnNTmlj ORae83SU7jsrQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 02/14] drm/radeon: integer overflow in radeon_mode_dumb_create() Date: Thu, 11 Aug 2022 12:09:30 -0400 Message-Id: <20220811160948.1542842-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811160948.1542842-1-sashal@kernel.org> References: <20220811160948.1542842-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , airlied@linux.ie, Xinhui.Pan@amd.com, amd-gfx@lists.freedesktop.org, Xiaohui Zhang , dri-devel@lists.freedesktop.org, daniel@ffwll.ch, Alex Deucher , christian.koenig@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" 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 27d8e7dd2d06..733d9ff08c62 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -750,7 +750,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 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 B8F31C282E7 for ; Thu, 11 Aug 2022 16:32:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238340AbiHKQc0 (ORCPT ); Thu, 11 Aug 2022 12:32:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238711AbiHKQbD (ORCPT ); Thu, 11 Aug 2022 12:31:03 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA652B81D6; Thu, 11 Aug 2022 09:09:54 -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 063AD6137B; Thu, 11 Aug 2022 16:09:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60D42C433D7; Thu, 11 Aug 2022 16:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660234193; bh=ffimnvJVit0Fcg4L295RnW58dCDMi4o1Jun9ClMnSQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXIwHui1GAqc9/fYz0GU5tws5ibIGYOdFlrpeOdSpDMO3BgsFWtKbA1D+bCKfPUJ1 X5V6tA4OTyRm4JCYzr9Lvs2BGZZX+cmUtiEHkfrQC8k3x1Z3lsyJie3QlQVfo4YCFu 09+g6ctgiStGyfhIzEUtwRCBwU//v/THb6frWVqskKecticbVeN3o2LT8aZSbOGk46 wP0zbgmx64c/SN3+zrYRVeGnnIp2aopH4kO8mq7WsIu5J0Ddyi41cjTdlhNGoazS4l 9tS+u5Oew63EF/1jfnrsOmVliSA42oa5W1/47dGvNqiep0LcycfXbNUWY2BOnNTmlj ORae83SU7jsrQ== 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 4.19 02/14] drm/radeon: integer overflow in radeon_mode_dumb_create() Date: Thu, 11 Aug 2022 12:09:30 -0400 Message-Id: <20220811160948.1542842-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811160948.1542842-1-sashal@kernel.org> References: <20220811160948.1542842-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 27d8e7dd2d06..733d9ff08c62 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -750,7 +750,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 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 99E8BC25B06 for ; Thu, 11 Aug 2022 16:10:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 31224113430; Thu, 11 Aug 2022 16:10:22 +0000 (UTC) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 29E6A14AD18; Thu, 11 Aug 2022 16:09:54 +0000 (UTC) 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 0919061422; Thu, 11 Aug 2022 16:09:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60D42C433D7; Thu, 11 Aug 2022 16:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660234193; bh=ffimnvJVit0Fcg4L295RnW58dCDMi4o1Jun9ClMnSQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXIwHui1GAqc9/fYz0GU5tws5ibIGYOdFlrpeOdSpDMO3BgsFWtKbA1D+bCKfPUJ1 X5V6tA4OTyRm4JCYzr9Lvs2BGZZX+cmUtiEHkfrQC8k3x1Z3lsyJie3QlQVfo4YCFu 09+g6ctgiStGyfhIzEUtwRCBwU//v/THb6frWVqskKecticbVeN3o2LT8aZSbOGk46 wP0zbgmx64c/SN3+zrYRVeGnnIp2aopH4kO8mq7WsIu5J0Ddyi41cjTdlhNGoazS4l 9tS+u5Oew63EF/1jfnrsOmVliSA42oa5W1/47dGvNqiep0LcycfXbNUWY2BOnNTmlj ORae83SU7jsrQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 02/14] drm/radeon: integer overflow in radeon_mode_dumb_create() Date: Thu, 11 Aug 2022 12:09:30 -0400 Message-Id: <20220811160948.1542842-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811160948.1542842-1-sashal@kernel.org> References: <20220811160948.1542842-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , airlied@linux.ie, Xinhui.Pan@amd.com, amd-gfx@lists.freedesktop.org, Xiaohui Zhang , dri-devel@lists.freedesktop.org, Alex Deucher , christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 27d8e7dd2d06..733d9ff08c62 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -750,7 +750,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