1. photon
  2. Commit 87103af1f4264f416cc08eb05df61ee1d3ff6f36
Browse code

kernels: fix vsock 9p issue (16bit port number)

It is an addition to vsock transport for 9p patch.
Vsock layer uses 32 bits for the port number but trans_fd
options parser limits it to 16 bits. It is safe to extend it
since it is internal structure and does not break existing code.

Change-Id: If54e58107cfbfd73b8ee46b806e1d4ce012583c5
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/7383
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Srivatsa S. Bhat <srivatsab@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

Alexey Makhalov authored on 2019/06/06 09:27:03
Showing 4 changed files
SPECS/linux/9p-trans_fd-extend-port-variable-to-u32.patch
History View file @ 87103af
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,30 @@
0 
+From 5bc8546db478209bb5eba4b225c1516689735ff3 Mon Sep 17 00:00:00 2001
1 
+From: Alexey Makhalov <amakhalov@vmware.com>
2 
+Date: Wed, 5 Jun 2019 17:17:28 -0700
3 
+Subject: [PATCH] 9p: trans_fd: extend port variable to u32
4 
+
5 
+This patch is an addition to vsock transport for 9p patch.
6 
+vsock layer uses 32 bits for the port number but trans_fd
7 
+options parser limits it to 16 bits. It is safe to extend
8 
+it since it is internal structure and does not break
9 
+existing code.
10 
+---
11 
+ net/9p/trans_fd.c | 2 +-
12 
+ 1 file changed, 1 insertion(+), 1 deletion(-)
13 
+
14 
+diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
15 
+index 236c6611f3fb..0f578af2fba7 100644
16 
+--- a/net/9p/trans_fd.c
17 
+@@ -64,7 +64,7 @@
18 
+ struct p9_fd_opts {
19 
+ 	int rfd;
20 
+ 	int wfd;
21 
+-	u16 port;
22 
++	u32 port;
23 
+ 	bool privport;
24 
+ };
25 
+
26 
+--
27 
+2.11.0
28 
+
SPECS/linux/linux-esx.spec
History View file @ 87103af
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Kernel
3 3 
 Name:           linux-esx
4 4 
 Version:        4.19.52
5 
-Release:        2%{?dist}
5 
+Release:        3%{?dist}
6 6 
 License:        GPLv2
7 7 
 URL:            http://www.kernel.org/
8 8 
 Group:          System Environment/Kernel
... ... 
@@ -22,6 +22,7 @@ Patch3:         SUNRPC-Do-not-reuse-srcport-for-TIME_WAIT-socket.patch
22 22 
 Patch4:         SUNRPC-xs_bind-uses-ip_local_reserved_ports.patch
23 23 
 Patch5:         vsock-transport-for-9p.patch
24 24 
 Patch6:         4.18-x86-vmware-STA-support.patch
25 
+Patch7:	        9p-trans_fd-extend-port-variable-to-u32.patch
25 26
26 27 
 # -esx
27 28 
 Patch13:        serial-8250-do-not-probe-U6-16550A-fifo-size.patch
... ... 
@@ -102,6 +103,7 @@ The Linux package contains the Linux kernel doc files
102 102 
 %patch4 -p1
103 103 
 %patch5 -p1
104 104 
 %patch6 -p1
105 
+%patch7 -p1
105 106 
 %patch13 -p1
106 107 
 %patch14 -p1
107 108 
 %patch15 -p1
... ... 
@@ -220,6 +222,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
220 220 
 /usr/src/linux-headers-%{uname_r}
221 221
222 222 
 %changelog
223 
+*   Tue Jul 02 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.52-3
224 
+-   Fix 9p vsock 16bit port issue.
223 225 
 *   Fri Jun 21 2019 Srinidhi Rao <srinidhir@vmware.com> 4.19.52-2
224 226 
 -   Use LZ4 compression and enable VMXNET3 as built-in for linux-esx
225 227 
 *   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1
SPECS/linux/linux-secure.spec
History View file @ 87103af
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Kernel
3 3 
 Name:           linux-secure
4 4 
 Version:        4.19.52
5 
-Release:        1%{?kat_build:.%kat_build}%{?dist}
5 
+Release:        2%{?kat_build:.%kat_build}%{?dist}
6 6 
 License:        GPLv2
7 7 
 URL:            http://www.kernel.org/
8 8 
 Group:          System Environment/Kernel
... ... 
@@ -22,8 +22,9 @@ Patch3:         SUNRPC-Do-not-reuse-srcport-for-TIME_WAIT-socket.patch
22 22 
 Patch4:         SUNRPC-xs_bind-uses-ip_local_reserved_ports.patch
23 23 
 Patch5:         vsock-transport-for-9p.patch
24 24 
 Patch6:         4.18-x86-vmware-STA-support.patch
25 
+Patch7:	        9p-trans_fd-extend-port-variable-to-u32.patch
25 26 
 # secure
26 
-Patch7:         0001-bpf-ext4-bonding-Fix-compilation-errors.patch
27 
+Patch12:        0001-bpf-ext4-bonding-Fix-compilation-errors.patch
27 28 
 Patch13:        0001-NOWRITEEXEC-and-PAX-features-MPROTECT-EMUTRAMP.patch
28 29 
 Patch14:        0002-Added-PAX_RANDKSTACK.patch
29 30 
 Patch15:        0003-Added-rap_plugin.patch
... ... 
@@ -114,6 +115,7 @@ The Linux package contains the Linux kernel doc files
114 114 
 %patch5 -p1
115 115 
 %patch6 -p1
116 116 
 %patch7 -p1
117 
+%patch12 -p1
117 118 
 %patch13 -p1
118 119 
 %patch14 -p1
119 120 
 %patch15 -p1
... ... 
@@ -260,6 +262,8 @@ ln -sf linux-%{uname_r}.cfg /boot/photon.cfg
260 260 
 /usr/src/linux-headers-%{uname_r}
261 261
262 262 
 %changelog
263 
+*   Tue Jul 02 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.52-2
264 
+-   Fix 9p vsock 16bit port issue.
263 265 
 *   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1
264 266 
 -   Update to version 4.19.52
265 267 
 -   Fix CVE-2019-12456, CVE-2019-12379, CVE-2019-12380, CVE-2019-12381,
SPECS/linux/linux.spec
History View file @ 87103af
... ... 
@@ -2,7 +2,7 @@
2 2 
 Summary:        Kernel
3 3 
 Name:           linux
4 4 
 Version:        4.19.52
5 
-Release:        2%{?kat_build:.%kat_build}%{?dist}
5 
+Release:        3%{?kat_build:.%kat_build}%{?dist}
6 6 
 License:    	GPLv2
7 7 
 URL:        	http://www.kernel.org/
8 8 
 Group:        	System Environment/Kernel
... ... 
@@ -28,6 +28,7 @@ Patch3:         SUNRPC-Do-not-reuse-srcport-for-TIME_WAIT-socket.patch
28 28 
 Patch4:         SUNRPC-xs_bind-uses-ip_local_reserved_ports.patch
29 29 
 Patch5:         vsock-transport-for-9p.patch
30 30 
 Patch6:         4.18-x86-vmware-STA-support.patch
31 
+Patch7:	        9p-trans_fd-extend-port-variable-to-u32.patch
31 32 
 # ttyXRUSB support
32 33 
 Patch11:	usb-acm-exclude-exar-usb-serial-ports.patch
33 34 
 #HyperV patches
... ... 
@@ -188,6 +189,7 @@ Kernel Device Tree Blob files for NXP ls1012a FRWY board
188 188 
 %patch4 -p1
189 189 
 %patch5 -p1
190 190 
 %patch6 -p1
191 
+%patch7 -p1
191 192 
 %patch11 -p1
192 193 
 %patch13 -p1
193 194 
 %patch24 -p1
... ... 
@@ -463,6 +465,8 @@ ln -sf %{name}-%{uname_r}.cfg /boot/photon.cfg
463 463 
 %endif
464 464
465 465 
 %changelog
466 
+*   Tue Jul 02 2019 Alexey Makhalov <amakhalov@vmware.com> 4.19.52-3
467 
+-   Fix 9p vsock 16bit port issue.
466 468 
 *   Thu Jun 20 2019 Tapas Kundu <tkundu@vmware.com> 4.19.52-2
467 469 
 -   Enabled CONFIG_I2C_CHARDEV to support lm-sensors
468 470 
 *   Mon Jun 17 2019 Srivatsa S. Bhat (VMware) <srivatsa@csail.mit.edu> 4.19.52-1