From 0c910c750c73d9ede800a8f94bfba8e328cd2c35 Mon Sep 17 00:00:00 2001 From: Oscar Salvador Date: Mar 30 2023 09:19:37 +0000 Subject: Merge remote-tracking branch 'origin/users/vkarasulli/SLE15-SP5-GA/for-next' into SLE15-SP5-GA Pull network fixes from Vasant Karasulli --- diff --git a/patches.suse/0001-net-tls-fix-possible-race-condition-between-do_tls_g.patch b/patches.suse/0001-net-tls-fix-possible-race-condition-between-do_tls_g.patch new file mode 100644 index 0000000..ba8237c --- /dev/null +++ b/patches.suse/0001-net-tls-fix-possible-race-condition-between-do_tls_g.patch @@ -0,0 +1,80 @@ +From 49c47cc21b5b7a3d8deb18fc57b0aa2ab1286962 Mon Sep 17 00:00:00 2001 +From: Hangyu Hua +Date: Tue Feb 28 10:33:44 2023 +0800 +Subject: [PATCH] net: tls: fix possible race condition between + do_tls_getsockopt_conf() and do_tls_setsockopt_conf() +Git-commit: 49c47cc21b5b7a3d8deb18fc57b0aa2ab1286962 +Patch-mainline: v6.3-rc2 +References: bsc#1209366 CVE-2023-28466 + +ctx->crypto_send.info is not protected by lock_sock in +do_tls_getsockopt_conf(). A race condition between do_tls_getsockopt_conf() +and error paths of do_tls_setsockopt_conf() may lead to a use-after-free +or null-deref. + +More discussion: https://lore.kernel.org/all/Y/ht6gQL+u6fj3dG@hog/ + +Fixes: 3c4d7559159b ("tls: kernel TLS support") +Signed-off-by: Hangyu Hua +Link: https://lore.kernel.org/r/20230228023344.9623-1-hbh25y@gmail.com +Signed-off-by: Jakub Kicinski +Acked-by: Vasant Karasulli + +--- + net/tls/tls_main.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c +index ce47bc3e6..1cb115366 100644 +--- a/net/tls/tls_main.c ++++ b/net/tls/tls_main.c +@@ -384,13 +384,11 @@ static int do_tls_getsockopt_conf(struct sock *sk, char __user *optval, + rc = -EINVAL; + goto out; + } +- lock_sock(sk); + memcpy(crypto_info_aes_gcm_128->iv, + cctx->iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE, + TLS_CIPHER_AES_GCM_128_IV_SIZE); + memcpy(crypto_info_aes_gcm_128->rec_seq, cctx->rec_seq, + TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE); +- release_sock(sk); + if (copy_to_user(optval, + crypto_info_aes_gcm_128, + sizeof(*crypto_info_aes_gcm_128))) +@@ -408,13 +406,11 @@ static int do_tls_getsockopt_conf(struct sock *sk, char __user *optval, + rc = -EINVAL; + goto out; + } +- lock_sock(sk); + memcpy(crypto_info_aes_gcm_256->iv, + cctx->iv + TLS_CIPHER_AES_GCM_256_SALT_SIZE, + TLS_CIPHER_AES_GCM_256_IV_SIZE); + memcpy(crypto_info_aes_gcm_256->rec_seq, cctx->rec_seq, + TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE); +- release_sock(sk); + if (copy_to_user(optval, + crypto_info_aes_gcm_256, + sizeof(*crypto_info_aes_gcm_256))) +@@ -434,6 +430,8 @@ static int do_tls_getsockopt(struct sock *sk, int optname, + { + int rc = 0; + ++ lock_sock(sk); ++ + switch (optname) { + case TLS_TX: + case TLS_RX: +@@ -444,6 +442,9 @@ static int do_tls_getsockopt(struct sock *sk, int optname, + rc = -ENOPROTOOPT; + break; + } ++ ++ release_sock(sk); ++ + return rc; + } + +-- +2.34.1 + diff --git a/series.conf b/series.conf index 3360c85..12d40d7 100644 --- a/series.conf +++ b/series.conf @@ -36901,6 +36901,7 @@ patches.suse/ipmi-ssif-Add-a-timer-between-request-retries.patch patches.suse/mm-memcontrol-deprecate-charge-moving.patch patches.suse/ibmvnic-Assign-XPS-map-to-correct-queue-index.patch + patches.suse/0001-net-tls-fix-possible-race-condition-between-do_tls_g.patch patches.suse/bnxt_en-Avoid-order-5-memory-allocation-for-TPA-data.patch ########################################################