Merge pull request containers#27 from slp/tsi_accept_fix

Update TSI patch to fix issue in tsi_accept

Makefile

@@ -6,7 +6,7 @@ KERNEL_PATCHES = $(shell find patches/ -name "0*.patch" | sort)
 KERNEL_C_BUNDLE = kernel.c
 
 ABI_VERSION=3
-FULL_VERSION=3.6.1
+FULL_VERSION=3.6.2
 
 ifeq ($(SEV),1)
     VARIANT = -sev

patches-sev/0012-virtio-enable-DMA-API-if-memory-is-restricted.patch

@@ -1,4 +1,4 @@
-From 97dfe80d6fe0a0c2c0d09e641b4cb77eacce532e Mon Sep 17 00:00:00 2001
+From 5bed46572790eae534077bf1d7d255e7415ab180 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Fri, 10 Sep 2021 13:05:01 +0200
 Subject: [PATCH 12/14] virtio: enable DMA API if memory is restricted

patches-sev/0013-x86-sev-write-AP-reset-vector.patch

@@ -1,4 +1,4 @@
-From a43719e6eee9c4eb15149e9501da90c4a5be9f96 Mon Sep 17 00:00:00 2001
+From d773dd1bb5959f7cfa48dd06e93d2d42d0008019 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Wed, 10 Aug 2022 13:28:06 +0200
 Subject: [PATCH 13/14] x86/sev: write AP reset vector

patches-sev/0014-Implement-driver-to-retrieve-secrets-from-cmdline.patch

@@ -1,4 +1,4 @@
-From 2e45d69ba541bdc3737e20b4b00986c6a15cb4b1 Mon Sep 17 00:00:00 2001
+From 18537264afe94f24d6238921ab76b7bc64bc3ab2 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Wed, 3 Aug 2022 12:35:12 +0200
 Subject: [PATCH 14/14] Implement driver to retrieve secrets from cmdline

patches/0011-tsi-allow-hijacking-sockets-tsi_hijack.patch

@@ -1,4 +1,4 @@
-From 0d319fba8147178249ce686efcd35045764b57eb Mon Sep 17 00:00:00 2001
+From 4ae01a8c0354ebcbb13f4ba9b1a801c702b3aee6 Mon Sep 17 00:00:00 2001
 From: Sergio Lopez <[email protected]>
 Date: Thu, 19 May 2022 22:42:01 +0200
 Subject: [PATCH 11/14] tsi: allow hijacking sockets (tsi_hijack)
@@ -9,8 +9,9 @@ sockets to turn them into TSI sockets.
 
 Signed-off-by: Sergio Lopez <[email protected]>
 ---
- net/socket.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
+ net/socket.c     | 17 +++++++++++++++++
+ net/tsi/af_tsi.c |  2 +-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/net/socket.c b/net/socket.c
 index bb3976abd269..b274930a3691 100644
@@ -54,6 +55,19 @@ index bb3976abd269..b274930a3691 100644
  	rcu_read_lock();
  	pf = rcu_dereference(net_families[family]);
  	err = -EAFNOSUPPORT;
+diff --git a/net/tsi/af_tsi.c b/net/tsi/af_tsi.c
+index 724c0ea36520..bb6004dedaa2 100644
+--- a/net/tsi/af_tsi.c
++++ b/net/tsi/af_tsi.c
+@@ -474,7 +474,7 @@ static int tsi_accept(struct socket *sock, struct socket *newsock, int flags,
+ 	struct socket *csocket;
+ 	struct tsi_sock *tsk;
+ 	struct tsi_sock *newtsk;
+-	struct socket *nsock;
++	struct socket *nsock = NULL;
+ 	struct sock *sk;
+ 	int err;
+
 -- 
 2.37.1