smb:server: fix possible use after free problems
Subsystems (3)
Stefan Metzmacher
reviewercover smb:server: fix possible use after free problems
While refactoring the client and server smbdirect code I noticed a few problems where we might hit use after free style problems.
In order to allow backports I decided to fix the problems before trying to move things to common code.
The client has similar problems, I've sent a separate patchset for the client already.
Stefan Metzmacher (4):
smb: server: remove separate empty_recvmsg_queue
smb: server: make sure we call ib_dma_unmap_single() only if we called
ib_dma_map_single already
smb: server: let recv_done() consitently call
put_recvmsg/smb_direct_disconnect_rdma_connection
smb: server: let recv_done() avoid touching data_transfer after
cleanup/move
fs/smb/server/transport_rdma.c | 97 ++++++++++++---------------------- 1 file changed, 35 insertions(+), 62 deletions(-)
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 1/4 smb: server: remove separate empty_recvmsg_queue
There's no need to maintain two lists, we can just have a single list of receive buffers, which are free to use.
--- fs/smb/server/transport_rdma.c | 60 +++++----------------------------- 1 file changed, 8 insertions(+), 52 deletions(-)
fs/smb/server/transport_rdma.c +8 -52
@@ -129,9 +129,6 @@ struct smb_direct_transport {spinlock_t recvmsg_queue_lock;struct list_head recvmsg_queue; -spinlock_t empty_recvmsg_queue_lock; -struct list_head empty_recvmsg_queue; -int send_credit_target;atomic_t send_credits;spinlock_t lock_new_recv_credits;
@@ -276,32 +273,6 @@ static void put_recvmsg(struct smb_direct_transport *t,spin_unlock (&t->recvmsg_queue_lock); } -static struct -smb_direct_recvmsg *get_empty_recvmsg (struct smb_direct_transport *t) -{ -struct smb_direct_recvmsg *recvmsg =NULL ; - -spin_lock (&t->empty_recvmsg_queue_lock); -if (!list_empty (&t->empty_recvmsg_queue)) { - recvmsg =list_first_entry (&t->empty_recvmsg_queue, - struct smb_direct_recvmsg, list); -list_del (&recvmsg->list); - } -spin_unlock (&t->empty_recvmsg_queue_lock); -return recvmsg; -} - -static void put_empty_recvmsg (struct smb_direct_transport *t, -struct smb_direct_recvmsg *recvmsg) -{ -ib_dma_unmap_single (t->cm_id->device, recvmsg->sge.addr, - recvmsg->sge.length,DMA_FROM_DEVICE ); - -spin_lock (&t->empty_recvmsg_queue_lock); -list_add_tail (&recvmsg->list, &t->empty_recvmsg_queue); -spin_unlock (&t->empty_recvmsg_queue_lock); -} -static void enqueue_reassembly (struct smb_direct_transport *t,struct smb_direct_recvmsg *recvmsg,int data_length)
@@ -386,9 +357,6 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)spin_lock_init (&t->recvmsg_queue_lock);INIT_LIST_HEAD (&t->recvmsg_queue); -spin_lock_init (&t->empty_recvmsg_queue_lock); -INIT_LIST_HEAD (&t->empty_recvmsg_queue); -init_waitqueue_head (&t->wait_send_pending);atomic_set (&t->send_pending,0 );
@@ -554,7 +522,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) wc->opcode);smb_direct_disconnect_rdma_connection (t); } -put_empty_recvmsg (t, recvmsg); +put_recvmsg (t, recvmsg);return ; }
@@ -568,7 +536,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)switch (recvmsg->type) {case SMB_DIRECT_MSG_NEGOTIATE_REQ :if (wc->byte_len <sizeof (struct smb_direct_negotiate_req )) { -put_empty_recvmsg (t, recvmsg); +put_recvmsg (t, recvmsg);return ; } t->negotiation_requested = true;
@@ -585,7 +553,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (wc->byte_len < offsetof(struct smb_direct_data_transfer , padding)) { -put_empty_recvmsg (t, recvmsg); +put_recvmsg (t, recvmsg);return ; }
@@ -593,7 +561,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (data_length) {if (wc->byte_len <sizeof (struct smb_direct_data_transfer ) + (u64 )data_length) { -put_empty_recvmsg (t, recvmsg); +put_recvmsg (t, recvmsg);return ; }
@@ -613,7 +581,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) avail_recvmsg_count = t->count_avail_recvmsg;spin_unlock (&t->receive_credit_lock); }else { -put_empty_recvmsg (t, recvmsg); +put_recvmsg (t, recvmsg);spin_lock (&t->receive_credit_lock); receive_credits = --(t->recv_credits);
@@ -811,7 +779,6 @@ static void smb_direct_post_recv_credits(struct work_struct *work)struct smb_direct_recvmsg *recvmsg;int receive_credits, credits =0 ;int ret; -int use_free =1 ;spin_lock (&t->receive_credit_lock); receive_credits = t->recv_credits;
@@ -819,18 +786,9 @@ static void smb_direct_post_recv_credits(struct work_struct *work)if (receive_credits < t->recv_credit_target) {while (true) { -if (use_free) - recvmsg =get_free_recvmsg (t); -else - recvmsg =get_empty_recvmsg (t); -if (!recvmsg) { -if (use_free) { - use_free =0 ; -continue ; - }else { -break ; - } - } + recvmsg =get_free_recvmsg (t); +if (!recvmsg) +break ; recvmsg->type =SMB_DIRECT_MSG_DATA_TRANSFER ; recvmsg->first_segment = false;
@@ -1806,8 +1764,6 @@ static void smb_direct_destroy_pools(struct smb_direct_transport *t)while ((recvmsg =get_free_recvmsg (t)))mempool_free (recvmsg, t->recvmsg_mempool); -while ((recvmsg =get_empty_recvmsg (t))) -mempool_free (recvmsg, t->recvmsg_mempool);mempool_destroy (t->recvmsg_mempool); t->recvmsg_mempool =NULL ;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 2/4 smb: server: make sure we call ib_dma_unmap_single() only if we called ib_dma_map_single already
In reply to Stefan MetzmacherIn case of failures either ib_dma_map_single() might not be called yet or ib_dma_unmap_single() was already called.
We should make sure put_recvmsg() only calls ib_dma_unmap_single() if needed.
--- fs/smb/server/transport_rdma.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
fs/smb/server/transport_rdma.c +9 -2
@@ -265,8 +265,13 @@ smb_direct_recvmsg *get_free_recvmsg(struct smb_direct_transport *t)static void put_recvmsg (struct smb_direct_transport *t,struct smb_direct_recvmsg *recvmsg) { -ib_dma_unmap_single (t->cm_id->device, recvmsg->sge.addr, - recvmsg->sge.length,DMA_FROM_DEVICE ); +if (likely (recvmsg->sge.length !=0 )) { +ib_dma_unmap_single (t->cm_id->device, + recvmsg->sge.addr, + recvmsg->sge.length, +DMA_FROM_DEVICE ); + recvmsg->sge.length =0 ; + }spin_lock (&t->recvmsg_queue_lock);list_add (&recvmsg->list, &t->recvmsg_queue);
@@ -638,6 +643,7 @@ static int smb_direct_post_recv(struct smb_direct_transport *t,ib_dma_unmap_single (t->cm_id->device, recvmsg->sge.addr, recvmsg->sge.length,DMA_FROM_DEVICE ); + recvmsg->sge.length =0 ;smb_direct_disconnect_rdma_connection (t);return ret; }
@@ -1819,6 +1825,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)if (!recvmsg) goto err; recvmsg->transport = t; + recvmsg->sge.length =0 ;list_add (&recvmsg->list, &t->recvmsg_queue); } t->count_avail_recvmsg = t->recv_credit_max;
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 3/4 smb: server: let recv_done() consitently call put_recvmsg/smb_direct_disconnect_rdma_connection
In reply to Stefan MetzmacherWe should call put_recvmsg() before smb_direct_disconnect_rdma_connection() in order to call it before waking up the callers.
In all error cases we should call smb_direct_disconnect_rdma_connection() in order to avoid stale connections.
--- fs/smb/server/transport_rdma.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
fs/smb/server/transport_rdma.c +13 -5
@@ -521,13 +521,13 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) t = recvmsg->transport;if (wc->status !=IB_WC_SUCCESS || wc->opcode !=IB_WC_RECV ) { +put_recvmsg (t, recvmsg);if (wc->status !=IB_WC_WR_FLUSH_ERR ) {pr_err ("Recv error. status='%s (%d)' opcode=%d\n" ,ib_wc_status_msg (wc->status), wc->status, wc->opcode);smb_direct_disconnect_rdma_connection (t); } -put_recvmsg (t, recvmsg);return ; }
@@ -542,6 +542,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)case SMB_DIRECT_MSG_NEGOTIATE_REQ :if (wc->byte_len <sizeof (struct smb_direct_negotiate_req )) {put_recvmsg (t, recvmsg); +smb_direct_disconnect_rdma_connection (t);return ; } t->negotiation_requested = true;
@@ -549,7 +550,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc) t->status =SMB_DIRECT_CS_CONNECTED ;enqueue_reassembly (t, recvmsg,0 );wake_up_interruptible (&t->wait_status); -break ; +return ;case SMB_DIRECT_MSG_DATA_TRANSFER : {struct smb_direct_data_transfer *data_transfer = (struct smb_direct_data_transfer *)recvmsg->packet;
@@ -559,6 +560,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (wc->byte_len < offsetof(struct smb_direct_data_transfer , padding)) {put_recvmsg (t, recvmsg); +smb_direct_disconnect_rdma_connection (t);return ; }
@@ -567,6 +569,7 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (wc->byte_len <sizeof (struct smb_direct_data_transfer ) + (u64 )data_length) {put_recvmsg (t, recvmsg); +smb_direct_disconnect_rdma_connection (t);return ; }
@@ -609,11 +612,16 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (is_receive_credit_post_required (receive_credits, avail_recvmsg_count))mod_delayed_work (smb_direct_wq, &t->post_recv_credits_work,0 ); -break ; +return ; } -default : -break ; } + +/* +* This is an internal error! +*/ +WARN_ON_ONCE (recvmsg->type !=SMB_DIRECT_MSG_DATA_TRANSFER ); +put_recvmsg (t, recvmsg); +smb_direct_disconnect_rdma_connection (t); } static int smb_direct_post_recv(struct smb_direct_transport *t,
Signature · 1 line
2.43.0
Stefan Metzmacher
reviewerPATCH 4/4 smb: server: let recv_done() avoid touching data_transfer after cleanup/move
In reply to Stefan MetzmacherCalling enqueue_reassembly() and wake_up_interruptible(&t->wait_reassembly_queue) or put_receive_buffer() means the recvmsg/data_transfer pointer might get re-used by another thread, which means these should be
the last operations before calling return.
--- fs/smb/server/transport_rdma.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
fs/smb/server/transport_rdma.c +7 -5
@@ -581,16 +581,11 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)else t->full_packet_received = true; -enqueue_reassembly (t, recvmsg, (int )data_length); -wake_up_interruptible (&t->wait_reassembly_queue); -spin_lock (&t->receive_credit_lock); receive_credits = --(t->recv_credits); avail_recvmsg_count = t->count_avail_recvmsg;spin_unlock (&t->receive_credit_lock); }else { -put_recvmsg (t, recvmsg); -spin_lock (&t->receive_credit_lock); receive_credits = --(t->recv_credits); avail_recvmsg_count = ++(t->count_avail_recvmsg);
@@ -612,6 +607,13 @@ static void recv_done(struct ib_cq *cq, struct ib_wc *wc)if (is_receive_credit_post_required (receive_credits, avail_recvmsg_count))mod_delayed_work (smb_direct_wq, &t->post_recv_credits_work,0 ); + +if (data_length) { +enqueue_reassembly (t, recvmsg, (int )data_length); +wake_up_interruptible (&t->wait_reassembly_queue); + }else +put_recvmsg (t, recvmsg); +return ; } }
Signature · 1 line
2.43.0
Namjae Jeon
maintainerQuoted 11 lines · Stefan Metzmacher via samba-technical
While refactoring the client and server smbdirect code I noticed a few problems where we might hit use after free style problems.
In order to allow backports I decided to fix the problems before trying to move things to common code.
The client has similar problems, I've sent a separate patchset for the client already.
Quoted 8 lines
Stefan Metzmacher (4):
smb: server: remove separateempty_recvmsg_queue
smb: server: make sure we callib_dma_unmap_single()only if we called
ib_dma_map_singlealready
smb: server: letrecv_done()consitently call
put_recvmsg/smb_direct_disconnect_rdma_connection
smb: server: letrecv_done()avoid touchingdata_transferafter
cleanup/move
I have directly fixed a typo : consitently -> consistently Applied 4 patches into #ksmbd-for-next-next. Thanks!
Quoted 8 lines
fs/smb/server/transport_rdma.c | 97 ++++++++++++---------------------- 1 file changed, 35 insertions(+), 62 deletions(-)--
2.43.0