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 C874017262A; Fri, 29 Mar 2024 12:34:51 +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=1711715691; cv=none; b=HCS7OEWnI3EvnQbPeoqLI+E1Wp4QNFJbn0htONGG+/PlJHaN04CU29r2P019ub7QYl5B9EktQzv2/joIM5N82ogVnAh2gppIfUD4WZaLWY/Nbq6bJTKQavRj0fH0mi9LbPfodMkAWQdBZJAy3p5gSCdWZmim23U1rdjjPxqIfcI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715691; c=relaxed/simple; bh=AZ0mB1d3R+H64t4ZWNRanPwr3ab/60b2LiI4buc8VcU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=krqlS0bBL/68CYx+7jQbDKtCSkJ5ucYmikv+pJUtw3Bdt4AjMDx83pWfHCf8qx5yYcOCpfSz/9WyJWG+4tJBNYn5IKfEhK4GVqPo6S4/Id4O3lUidAB8HYcOYXhpuP8Xzr3D+fJRVurzdwvUAubpBKB1DhpC9ErwFK+rg4bSPVI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KYgwOj+/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KYgwOj+/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C178C43399; Fri, 29 Mar 2024 12:34:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715691; bh=AZ0mB1d3R+H64t4ZWNRanPwr3ab/60b2LiI4buc8VcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KYgwOj+/O2I8lWxXfnBPRIGtiWC1hl8ywb7P6lSs0y99gl2MMDBWEh/YKinuGTPKB 335RU+rw4U8nh6aF6K+XoF7sQdNXKSM0nauxKUZ9D+wA10/8MvEvSBjPvr0aBn6cEC cwt9GY0iHVXvbwkYIDUhnrU9EQjOIBgRofjU3Uyza4hHh23PB4Kn+3HBeDLQuvg3gV Z+LAKFgNmfn/IX4xmWL8vvdse+On7ZQ0YYT3iODrCVhfm90F/wvg8aOOvCabfy/ImS y7AalnKnrYxzLJpTfPjmDOj3F5A92bEoXL9tuPVy+c88WOqqeWcQW1UN2s4sUQQQIR OZ0fL1IcYavXw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Harshit Mogalapalli , syzkaller , Vegard Nossum , "Gustavo A . R . Silva" , Kees Cook , Dan Carpenter , Sasha Levin , bryantan@vmware.com, vdasa@vmware.com, gregkh@linuxfoundation.org Subject: [PATCH AUTOSEL 5.4 04/15] VMCI: Fix memcpy() run-time warning in dg_dispatch_as_host() Date: Fri, 29 Mar 2024 08:34:27 -0400 Message-ID: <20240329123445.3086536-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123445.3086536-1-sashal@kernel.org> References: <20240329123445.3086536-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.4.273 Content-Transfer-Encoding: 8bit From: Harshit Mogalapalli [ Upstream commit 19b070fefd0d024af3daa7329cbc0d00de5302ec ] Syzkaller hit 'WARNING in dg_dispatch_as_host' bug. memcpy: detected field-spanning write (size 56) of single field "&dg_info->msg" at drivers/misc/vmw_vmci/vmci_datagram.c:237 (size 24) WARNING: CPU: 0 PID: 1555 at drivers/misc/vmw_vmci/vmci_datagram.c:237 dg_dispatch_as_host+0x88e/0xa60 drivers/misc/vmw_vmci/vmci_datagram.c:237 Some code commentry, based on my understanding: 544 #define VMCI_DG_SIZE(_dg) (VMCI_DG_HEADERSIZE + (size_t)(_dg)->payload_size) /// This is 24 + payload_size memcpy(&dg_info->msg, dg, dg_size); Destination = dg_info->msg ---> this is a 24 byte structure(struct vmci_datagram) Source = dg --> this is a 24 byte structure (struct vmci_datagram) Size = dg_size = 24 + payload_size {payload_size = 56-24 =32} -- Syzkaller managed to set payload_size to 32. 35 struct delayed_datagram_info { 36 struct datagram_entry *entry; 37 struct work_struct work; 38 bool in_dg_host_queue; 39 /* msg and msg_payload must be together. */ 40 struct vmci_datagram msg; 41 u8 msg_payload[]; 42 }; So those extra bytes of payload are copied into msg_payload[], a run time warning is seen while fuzzing with Syzkaller. One possible way to fix the warning is to split the memcpy() into two parts -- one -- direct assignment of msg and second taking care of payload. Gustavo quoted: "Under FORTIFY_SOURCE we should not copy data across multiple members in a structure." Reported-by: syzkaller Suggested-by: Vegard Nossum Suggested-by: Gustavo A. R. Silva Signed-off-by: Harshit Mogalapalli Reviewed-by: Gustavo A. R. Silva Reviewed-by: Kees Cook Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/20240105164001.2129796-2-harshit.m.mogalapalli@oracle.com Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- drivers/misc/vmw_vmci/vmci_datagram.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/misc/vmw_vmci/vmci_datagram.c b/drivers/misc/vmw_vmci/vmci_datagram.c index f50d22882476f..d1d8224c8800c 100644 --- a/drivers/misc/vmw_vmci/vmci_datagram.c +++ b/drivers/misc/vmw_vmci/vmci_datagram.c @@ -234,7 +234,8 @@ static int dg_dispatch_as_host(u32 context_id, struct vmci_datagram *dg) dg_info->in_dg_host_queue = true; dg_info->entry = dst_entry; - memcpy(&dg_info->msg, dg, dg_size); + 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); -- 2.43.0