]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: vmw_vsock: vmci: Check memcpy_from_msg()
authorArtem Chernyshev <artem.chernyshev@red-soft.ru>
Tue, 6 Dec 2022 06:58:34 +0000 (09:58 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Jan 2023 10:41:13 +0000 (11:41 +0100)
[ Upstream commit 44aa5a6dba8283bfda28b1517af4de711c5652a4 ]

vmci_transport_dgram_enqueue() does not check the return value
of memcpy_from_msg().  If memcpy_from_msg() fails, it is possible that
uninitialized memory contents are sent unintentionally instead of user's
message in the datagram to the destination.  Return with an error if
memcpy_from_msg() fails.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: fd4d609c27b3 ("vmci_transport: switch ->enqeue_dgram, ->enqueue_stream and ->dequeue_stream to msghdr")
Signed-off-by: Artem Chernyshev <artem.chernyshev@red-soft.ru>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Vishnu Dasa <vdasa@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/vmw_vsock/vmci_transport.c

index aaabcd84268a98a766e167fb3ae2db1052256a98..85488e19dffc910c6de9df1e9b658fe6e3b58648 100644 (file)
@@ -1725,7 +1725,11 @@ static int vmci_transport_dgram_enqueue(
        if (!dg)
                return -ENOMEM;
 
-       memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+       err = memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len);
+       if (err) {
+               kfree(dg);
+               return err;
+       }
 
        dg->dst = vmci_make_handle(remote_addr->svm_cid,
                                   remote_addr->svm_port);