nvmet-tcp: fix callback lock for TLS handshake
Subsystems (2)
PATCH 1/1 nvmet-tcp: fix callback lock for TLS handshake
When restoring the default socket callbacks during a
TLS handshake, we need to acquire a write lock on sk_callback_lock. Previously, a read lock was used, which is insufficient for modifying sk_user_data and sk_data_ready.
Signed-off-by Maurizio Lombardi <[email protected]>
--- drivers/nvme/target/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/target/tcp.c +2 -2
@@ -1928,10 +1928,10 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,struct sock *sk = queue->sock->sk;/* Restore the default callbacks before starting upcall */ -read_lock_bh (&sk->sk_callback_lock); +write_lock_bh (&sk->sk_callback_lock); sk->sk_user_data =NULL ; sk->sk_data_ready = port->data_ready; -read_unlock_bh (&sk->sk_callback_lock); +write_unlock_bh (&sk->sk_callback_lock);if (!nvmet_tcp_try_peek_pdu (queue)) {if (!nvmet_tcp_tls_handshake (queue))return ;
Signature · 1 line
2.47.1
Quoted 4 lines · Maurizio Lombardi
When restoring the default socket callbacks during a
TLS handshake, we need to acquire a write lock onsk_callback_lock. Previously, a read lock was used, which is insufficient for modifyingsk_user_dataandsk_data_ready.
I forgot the Fixes tag
Fixes 675b453e0241 ("nvmet-tcp: enable TLS handshake upcall")
Maurizio
Quoted 23 lines
Signed-off-by Maurizio Lombardi <[email protected]>--- drivers/nvme/target/tcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/nvme/target/tcp.c +2
-2@@ -1928,10 +1928,10 @@ static void nvmet_tcp_alloc_queue(struct nvmet_tcp_port *port,struct sock *sk = queue->sock->sk;/* Restore the default callbacks before starting upcall */ -read_lock_bh (&sk->sk_callback_lock); +write_lock_bh (&sk->sk_callback_lock); sk->sk_user_data =NULL ; sk->sk_data_ready = port->data_ready; -read_unlock_bh (&sk->sk_callback_lock); +write_unlock_bh (&sk->sk_callback_lock);if (!nvmet_tcp_try_peek_pdu (queue)) {if (!nvmet_tcp_tls_handshake (queue))return ;
Thanks, applied to nvme-6.16.