[Devel] [PATCH RHEL7 COMMIT] ms/hv_sock: set VMADDR_CID_HOST in the hvs_remote_addr_init()

[Vasily Averin]

The commit is pushed to "branch-rh7-3.10.0-1160.21.1.vz7.174.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.21.1.vz7.174.10
------>
commit 74fd8196cdd4f99a81b805bc4fe45f5051969c6b
Author: Stefano Garzarella <sgarzare at redhat.com>
Date:   Wed Apr 21 17:53:02 2021 +0300

    ms/hv_sock: set VMADDR_CID_HOST in the hvs_remote_addr_init()
    
    Remote peer is always the host, so we set VMADDR_CID_HOST as
    remote CID instead of VMADDR_CID_ANY.
    
    Reviewed-by: Dexuan Cui <decui at microsoft.com>
    Reviewed-by: Stefan Hajnoczi <stefanha at redhat.com>
    Signed-off-by: Stefano Garzarella <sgarzare at redhat.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    
    https://jira.sw.ru/browse/PSBM-128702
    (cherry picked from commit 039642574cc4ff77b1c8ca042c879fa6995ce154)
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 net/vmw_vsock/hyperv_transport.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/vmw_vsock/hyperv_transport.c b/net/vmw_vsock/hyperv_transport.c
index 7a5c532..18e0e5b 100644
--- a/net/vmw_vsock/hyperv_transport.c
+++ b/net/vmw_vsock/hyperv_transport.c
@@ -191,7 +191,8 @@ static void hvs_remote_addr_init(struct sockaddr_vm *remote,
 	static u32 host_ephemeral_port = MIN_HOST_EPHEMERAL_PORT;
 	struct sock *sk;
 
-	vsock_addr_init(remote, VMADDR_CID_ANY, VMADDR_PORT_ANY);
+	/* Remote peer is always the host */
+	vsock_addr_init(remote, VMADDR_CID_HOST, VMADDR_PORT_ANY);
 
 	while (1) {
 		/* Wrap around ? */