Commit 8236b08c authored by Lepton Wu's avatar Lepton Wu Committed by David S. Miller

VSOCK: bind to random port for VMADDR_PORT_ANY

The old code always starts from fixed port for VMADDR_PORT_ANY. Sometimes
when VMM crashed, there is still orphaned vsock which is waiting for
close timer, then it could cause connection time out for new started VM
if they are trying to connect to same port with same guest cid since the
new packets could hit that orphaned vsock. We could also fix this by doing
more in vhost_vsock_reset_orphans, but any way, it should be better to start
from a random local port instead of a fixed one.
Signed-off-by: default avatarLepton Wu <ytht.net@gmail.com>
Reviewed-by: default avatarJorgen Hansen <jhansen@vmware.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c27369f
...@@ -107,6 +107,7 @@ ...@@ -107,6 +107,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/net.h> #include <linux/net.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/random.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <linux/socket.h> #include <linux/socket.h>
...@@ -504,9 +505,13 @@ static void vsock_pending_work(struct work_struct *work) ...@@ -504,9 +505,13 @@ static void vsock_pending_work(struct work_struct *work)
static int __vsock_bind_stream(struct vsock_sock *vsk, static int __vsock_bind_stream(struct vsock_sock *vsk,
struct sockaddr_vm *addr) struct sockaddr_vm *addr)
{ {
static u32 port = LAST_RESERVED_PORT + 1; static u32 port = 0;
struct sockaddr_vm new_addr; struct sockaddr_vm new_addr;
if (!port)
port = LAST_RESERVED_PORT + 1 +
prandom_u32_max(U32_MAX - LAST_RESERVED_PORT);
vsock_addr_init(&new_addr, addr->svm_cid, addr->svm_port); vsock_addr_init(&new_addr, addr->svm_cid, addr->svm_port);
if (addr->svm_port == VMADDR_PORT_ANY) { if (addr->svm_port == VMADDR_PORT_ANY) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment