Commit 3014fcc3 authored by Vasiliy Kovalev's avatar Vasiliy Kovalev Committed by sanglipeng1
Browse files

VMCI: Fix possible memcpy() run-time warning in vmci_datagram_invoke_guest_handler() 

stable inclusion
from stable-v5.10.215
commit 682f6ca9675918c8d28758bfcd409e29e673b456
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJJ2D

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=682f6ca9675918c8d28758bfcd409e29e673b456



--------------------------------

commit e606e4b71798cc1df20e987dde2468e9527bd376 upstream.

The changes are similar to those given in the commit 19b070fefd0d
("VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host()").

Fix filling of the msg and msg_payload in dg_info struct, which prevents a
possible "detected field-spanning write" of memcpy warning that is issued
by the tracking mechanism __fortify_memcpy_chk.

Signed-off-by: default avatarVasiliy Kovalev <kovalev@altlinux.org>
Link: https://lore.kernel.org/r/20240219105315.76955-1-kovalev@altlinux.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent fb553d24

drivers/misc/vmw_vmci/vmci_datagram.c

+2 −1
Original line number Diff line number Diff line
@@ -378,7 +378,8 @@ int vmci_datagram_invoke_guest_handler(struct vmci_datagram *dg) 


		dg_info->in_dg_host_queue = false;

		dg_info->entry = dst_entry;

		memcpy(&dg_info->msg, dg, VMCI_DG_SIZE(dg));

		dg_info->msg = *dg;

		memcpy(&dg_info->msg_payload, dg + 1, dg->payload_size);



		INIT_WORK(&dg_info->work, dg_delayed_dispatch);

		schedule_work(&dg_info->work);