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 0BBC7C0018C for ; Tue, 7 Nov 2023 12:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234936AbjKGMkG (ORCPT ); Tue, 7 Nov 2023 07:40:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343967AbjKGMjd (ORCPT ); Tue, 7 Nov 2023 07:39:33 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6F561993; Tue, 7 Nov 2023 04:28:30 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C9C2C433C8; Tue, 7 Nov 2023 12:28:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699360110; bh=4EG7luJOnD4UHAYh6XDiam6hNCuSchH/nuZd/1EY5n4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YlEvzwDaobhxzsAaiMZPVpgx3taUI/1tFF0CrbAaNhPaCWyiufhEr8qPsCuC4Sbq5 91Re9x2BbEGTJayPFMWxVhJhhSGuH7U3cIQM6BT1btnTmMOSxXy+KG25t7iPYHzPQ3 ZGH54xmjTekHZPPLJQrNi6F7axdjzAI47hs5QEdTRvnxXL9cBdDvsmBRWOW4kRRK1P zwzWgBHA64bL/1ovLWBgRcl8hMMa9xjSxWs3DkAXGf3ZBriNER1XOQymLNXx2yGGXk GiPgGCvo27SmW0r0EuTCEIjvHneBjGEdxvNLhvjadY7S90zyP2ybdBW7xQcwAfCKkw o5ACn2dHkXZFA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Philipp Stanner , David Airlie , Kees Cook , Zack Rusin , Sasha Levin , maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.1 11/25] drm: vmwgfx_surface.c: copy user-array safely Date: Tue, 7 Nov 2023 07:26:50 -0500 Message-ID: <20231107122745.3761613-11-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107122745.3761613-1-sashal@kernel.org> References: <20231107122745.3761613-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.61 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Philipp Stanner [ Upstream commit 06ab64a0d836ac430c5f94669710a78aa43942cb ] Currently, there is no overflow-check with memdup_user(). Use the new function memdup_array_user() instead of memdup_user() for duplicating the user-space array safely. Suggested-by: David Airlie Signed-off-by: Philipp Stanner Reviewed-by: Kees Cook Reviewed-by: Zack Rusin Signed-off-by: Dave Airlie Link: https://patchwork.freedesktop.org/patch/msgid/20230920123612.16914-7-pstanner@redhat.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index 591c301e6cf21..1a1a286bc749f 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -774,9 +774,9 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, sizeof(metadata->mip_levels)); metadata->num_sizes = num_sizes; metadata->sizes = - memdup_user((struct drm_vmw_size __user *)(unsigned long) + memdup_array_user((struct drm_vmw_size __user *)(unsigned long) req->size_addr, - sizeof(*metadata->sizes) * metadata->num_sizes); + metadata->num_sizes, sizeof(*metadata->sizes)); if (IS_ERR(metadata->sizes)) { ret = PTR_ERR(metadata->sizes); goto out_no_sizes; -- 2.42.0