@@ -2,7 +2,7 @@

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.4.31

-Release:       3%{?dist}

+Release:       4%{?dist}

 License:       GPLv2

 URL:           http://www.kernel.org/

 Group:         System Environment/Kernel

@@ -36,6 +36,7 @@ Patch20:       vmci-1.1.4.0-use-32bit-atomics-for-queue-headers.patch

 Patch21:       vmci-1.1.5.0-doorbell-create-and-destroy-fixes.patch

 #fixes CVE-2016-7039

 Patch22:       net-add-recursion-limit-to-GRO.patch

+Patch23:       net-9p-vsock.patch

 BuildRequires: bc

 BuildRequires: kbd

 BuildRequires: kmod

@@ -93,6 +94,7 @@ The Linux package contains the Linux kernel doc files

 %patch20 -p1

 %patch21 -p1

 %patch22 -p1

+%patch23 -p1

 %build

 # patch vmw_balloon driver

@@ -164,6 +166,8 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /usr/src/%{name}-headers-%{version}-%{release}

 %changelog

+*   Tue Nov 22 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-4

+-   net-9p-vsock.patch

 *   Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-3

 -   tty-prevent-ldisc-drivers-from-re-using-stale-tty-fields.patch

     to fix CVE-2015-8964

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:    	4.4.31

-Release:    	3%{?dist}

+Release:    	4%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -31,6 +31,7 @@ Patch14:        vmxnet3-1.4.8.0-segCnt-can-be-1-for-LRO-packets.patch

 Patch15:        apparmor-fix-oops-validate-buffer-size-in-apparmor_setprocattr.patch

 #fixes CVE-2016-7039

 Patch16:        net-add-recursion-limit-to-GRO.patch

+Patch17:        net-9p-vsock.patch

 BuildRequires:  bc

 BuildRequires:  kbd

 BuildRequires:  kmod

@@ -103,6 +104,7 @@ Kernel driver for oprofile, a statistical profiler for Linux systems

 %patch14 -p1

 %patch15 -p1

 %patch16 -p1

+%patch17 -p1

 %build

 make mrproper

@@ -200,6 +202,8 @@ ln -s /usr/lib/debug/lib/modules/%{version}/vmlinux-%{version}-%{release}.debug

 /lib/modules/%{version}/kernel/arch/x86/oprofile/

 %changelog

+*   Tue Nov 22 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-4

+-   net-9p-vsock.patch

 *   Thu Nov 17 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-3

 -   tty-prevent-ldisc-drivers-from-re-using-stale-tty-fields.patch

     to fix CVE-2015-8964

new file mode 100644

@@ -0,0 +1,105 @@

+diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c

+index bced8c0..ac57c4b 100644

+--- a/net/9p/trans_fd.c

+@@ -37,6 +37,8 @@

+ #include <linux/un.h>

+ #include <linux/uaccess.h>

+ #include <linux/inet.h>

++#include <linux/vmw_vmci_defs.h>

++#include <uapi/linux/vm_sockets.h>

+ #include <linux/idr.h>

+ #include <linux/file.h>

+ #include <linux/parser.h>

+@@ -64,6 +66,7 @@ struct p9_fd_opts {

+ 	int wfd;

+ 	u16 port;

+ 	int privport;

++	int vsock;

+ };

+ 

+ /*

+@@ -73,7 +76,7 @@ struct p9_fd_opts {

+ 

+ enum {

+ 	/* Options that take integer arguments */

+-	Opt_port, Opt_rfdno, Opt_wfdno, Opt_err,

++	Opt_port, Opt_rfdno, Opt_wfdno, Opt_err, Opt_vsock,

+ 	/* Options that take no arguments */

+ 	Opt_privport,

+ };

+@@ -83,6 +86,7 @@ static const match_table_t tokens = {

+ 	{Opt_rfdno, "rfdno=%u"},

+ 	{Opt_wfdno, "wfdno=%u"},

+ 	{Opt_privport, "privport"},

++	{Opt_vsock, "vsock=%d"},

+ 	{Opt_err, NULL},

+ };

+ 

+@@ -735,6 +739,7 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)

+ 	opts->rfd = ~0;

+ 	opts->wfd = ~0;

+ 	opts->privport = 0;

++	opts->vsock = 0;

+ 

+ 	if (!params)

+ 		return 0;

+@@ -774,6 +779,9 @@ static int parse_opts(char *params, struct p9_fd_opts *opts)

+ 		case Opt_privport:

+ 			opts->privport = 1;

+ 			break;

++		case Opt_vsock:

++			opts->vsock = option;

++			break;

+ 		default:

+ 			continue;

+ 		}

+@@ -938,11 +946,27 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)

+ 

+ 	csocket = NULL;

+ 

+-	sin_server.sin_family = AF_INET;

+-	sin_server.sin_addr.s_addr = in_aton(addr);

+-	sin_server.sin_port = htons(opts.port);

+-	err = __sock_create(current->nsproxy->net_ns, PF_INET,

+-			    SOCK_STREAM, IPPROTO_TCP, &csocket, 1);

++	if (opts.vsock == 0) {

++		sin_server.sin_family = AF_INET;

++		sin_server.sin_addr.s_addr = in_aton(addr);

++		sin_server.sin_port = htons(opts.port);

++		err = __sock_create(current->nsproxy->net_ns, PF_INET,

++		                    SOCK_STREAM, IPPROTO_TCP, &csocket, 1);

++	} else {

++		/*

++		 * for vsock, addr is not used, but opts.vsock is the vsock address,

++		 * where 2 means host (hypervisor), and other numbers mean the vmci id

++		 * in the VMX file of this running VM

++		 */

++		struct sockaddr_vm *vsock_server = (struct sockaddr_vm*)&sin_server;

++

++		memset(vsock_server, 0, sizeof(struct sockaddr_vm));

++		vsock_server->svm_family = AF_VSOCK;

++		vsock_server->svm_port = opts.port;

++		vsock_server->svm_cid = opts.vsock;

++		err = __sock_create(read_pnet(&current->nsproxy->net_ns), PF_VSOCK,

++		                    SOCK_STREAM, 0, &csocket, 1);

++	}

+ 	if (err) {

+ 		pr_err("%s (%d): problem creating socket\n",

+ 		       __func__, task_pid_nr(current));

+@@ -963,8 +987,13 @@ p9_fd_create_tcp(struct p9_client *client, const char *addr, char *args)

+ 				    (struct sockaddr *)&sin_server,

+ 				    sizeof(struct sockaddr_in), 0);

+ 	if (err < 0) {

+-		pr_err("%s (%d): problem connecting socket to %s\n",

+-		       __func__, task_pid_nr(current), addr);

++		if (opts.vsock) {

++			pr_err("%s (%d): problem connecting vmware vsock addr %d\n",

++			       __func__, task_pid_nr(current), opts.vsock);

++		} else {

++			pr_err("%s (%d): problem connecting socket to %s\n",

++			       __func__, task_pid_nr(current), addr);

++		}

+ 		sock_release(csocket);

+ 		return err;

+ 	}