From ee7dd33a438e89800a1e9f7b99e4cb154610d14a Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 24 Mar 2023 20:41:55 -0400 Subject: [PATCH] Fixes for 5.10 Signed-off-by: Sasha Levin --- ...ible-race-condition-between-do_tls_g.patch | 81 +++++++++++++++++++ queue-5.10/series | 1 + 2 files changed, 82 insertions(+) create mode 100644 queue-5.10/net-tls-fix-possible-race-condition-between-do_tls_g.patch diff --git a/queue-5.10/net-tls-fix-possible-race-condition-between-do_tls_g.patch b/queue-5.10/net-tls-fix-possible-race-condition-between-do_tls_g.patch new file mode 100644 index 00000000000..017a7c43e1e --- /dev/null +++ b/queue-5.10/net-tls-fix-possible-race-condition-between-do_tls_g.patch @@ -0,0 +1,81 @@ +From 60f4ceac3592cf227b6827fcabac6444e6eb5248 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 23 Mar 2023 05:03:22 +0000 +Subject: net: tls: fix possible race condition between + do_tls_getsockopt_conf() and do_tls_setsockopt_conf() + +From: Hangyu Hua + +commit 49c47cc21b5b7a3d8deb18fc57b0aa2ab1286962 upstream. + +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 +Signed-off-by: Meena Shanmugam +Signed-off-by: Sasha Levin +--- + 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 e537085b184fe..54863e68f3040 100644 +--- a/net/tls/tls_main.c ++++ b/net/tls/tls_main.c +@@ -386,13 +386,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))) +@@ -410,13 +408,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))) +@@ -436,6 +432,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: +@@ -446,6 +444,9 @@ static int do_tls_getsockopt(struct sock *sk, int optname, + rc = -ENOPROTOOPT; + break; + } ++ ++ release_sock(sk); ++ + return rc; + } + +-- +2.39.2 + diff --git a/queue-5.10/series b/queue-5.10/series index 1be04b29dc3..bbf6a21e3fe 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -16,3 +16,4 @@ serial-8250-serial_8250_aspeed_vuart-should-depend-o.patch serial-8250-aspeed_vuart-select-regmap-instead-of-de.patch interconnect-qcom-msm8974-fix-registration-race.patch drm-sun4i-fix-missing-component-unbind-on-bind-error.patch +net-tls-fix-possible-race-condition-between-do_tls_g.patch -- 2.47.3