From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DE973D0D1; Tue, 14 May 2024 11:51:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715687474; cv=none; b=eWR0JxIOEVIvh9ADVF3krU44Jfg6Fs2chuVsFiOO64OO71W9DwMEPhMXk2F0m7z5V2NWknV/pO6Psz2qpGb06WSgLQ/ycnusHeL7FMTVbsF1m8VtczO2a/AORRF5wwHYrzk7HnjS9450Bd5d17KcgqtRM2pQN82S/917lkwliGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715687474; c=relaxed/simple; bh=ob9UhLXfsEKUth0Ez4ZrkYRD2T+sIk+OWpjedlJkMZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s6Cn5JDdnTV+xKzqZX3VGOtlQju6yUlAOOvG5dKHMyUbfff8XdU5RRhwZ3MX0dx+ETW9dHzNkU3YitTnlTTXw0VYM4vGsFdGnOw1EIO7m74ICCnLwW55ocHxC86B4OlS+oLroqLKsipgB/MEle8Zv45nt95tH8/dW5yINvEiJKo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yMlLDOo2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yMlLDOo2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F36AC2BD10; Tue, 14 May 2024 11:51:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715687474; bh=ob9UhLXfsEKUth0Ez4ZrkYRD2T+sIk+OWpjedlJkMZM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yMlLDOo2yJ+CRXhSe3U7uIGrQvnLAOrjn6MNrKtOkj/3AymEVhkVGamQuOgwlwV6x Fh4a3Y/oT1YojEDBEJ3q6lzZy8pfnwmAVYACnoAsIE/WONwCXbWq1eLenH4mUGzET3 u0OSXPi0RNGdlVqaDPqNv02HeVwXraOMX1yw//ZM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zack Rusin , David Airlie , Daniel Vetter , Broadcom internal kernel review list , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Maaz Mombasawala , Martin Krastev , zdi-disclosures@trendmicro.com Subject: [PATCH 5.10 108/111] drm/vmwgfx: Fix invalid reads in fence signaled events Date: Tue, 14 May 2024 12:20:46 +0200 Message-ID: <20240514101001.236155901@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514100957.114746054@linuxfoundation.org> References: <20240514100957.114746054@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zack Rusin commit a37ef7613c00f2d72c8fc08bd83fb6cc76926c8c upstream. Correctly set the length of the drm_event to the size of the structure that's actually used. The length of the drm_event was set to the parent structure instead of to the drm_vmw_event_fence which is supposed to be read. drm_read uses the length parameter to copy the event to the user space thus resuling in oob reads. Signed-off-by: Zack Rusin Fixes: 8b7de6aa8468 ("vmwgfx: Rework fence event action") Reported-by: zdi-disclosures@trendmicro.com # ZDI-CAN-23566 Cc: David Airlie CC: Daniel Vetter Cc: Zack Rusin Cc: Broadcom internal kernel review list Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org Cc: # v3.4+ Reviewed-by: Maaz Mombasawala Reviewed-by: Martin Krastev Link: https://patchwork.freedesktop.org/patch/msgid/20240425192748.1761522-1-zack.rusin@broadcom.com Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -1066,7 +1066,7 @@ static int vmw_event_fence_action_create } event->event.base.type = DRM_VMW_EVENT_FENCE_SIGNALED; - event->event.base.length = sizeof(*event); + event->event.base.length = sizeof(event->event); event->event.user_data = user_data; ret = drm_event_reserve_init(dev, file_priv, &event->base, &event->event.base);