fs: dlm: fix race in mhandle deletion
Alexander Aring
maintainerPATCH 1/2 fs: dlm: fix race in mhandle deletion
This patch fixes a race between mhandle deletion in case of receiving an acknowledge and flush of all pending mhandle in cases of an timeout or resetting node states.
Fixes 489d8e559c65 ("fs: dlm: add reliable connection if reconnect")
Reported-by Guillaume Nault <[email protected]>
Signed-off-by Alexander Aring <[email protected]>
--- fs/dlm/midcomms.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
fs/dlm/midcomms.c +21 -14
@@ -287,6 +287,14 @@ static void dlm_mhandle_release(struct rcu_head *rcu)kfree (mh); } +static void dlm_mhandle_delete (struct midcomms_node *node, +struct dlm_mhandle *mh) +{ +list_del_rcu (&mh->list); +atomic_dec (&node->send_queue_cnt); +call_rcu (&mh->rcu, dlm_mhandle_release); +} +static void dlm_send_queue_flush (struct midcomms_node *node) {struct dlm_mhandle *mh;
@@ -294,15 +302,11 @@ static void dlm_send_queue_flush(struct midcomms_node *node)pr_debug ("flush midcomms send queue of node %d\n" , node->nodeid);rcu_read_lock (); +spin_lock (&node->send_queue_lock);list_for_each_entry_rcu (mh, &node->send_queue, list) { -spin_lock (&node->send_queue_lock); -list_del_rcu (&mh->list); -spin_unlock (&node->send_queue_lock); - -atomic_dec (&node->send_queue_cnt); - -call_rcu (&mh->rcu, dlm_mhandle_release); +dlm_mhandle_delete (node, mh); } +spin_unlock (&node->send_queue_lock);rcu_read_unlock (); }
@@ -424,21 +428,24 @@ static void dlm_receive_ack(struct midcomms_node *node, uint32_t seq)rcu_read_lock ();list_for_each_entry_rcu (mh, &node->send_queue, list) {if (before (mh->seq, seq)) { -spin_lock (&node->send_queue_lock); -list_del_rcu (&mh->list); -spin_unlock (&node->send_queue_lock); - -atomic_dec (&node->send_queue_cnt); -if (mh->ack_rcv) mh->ack_rcv (node); + }else { +/* send queue should be ordered */ +break ; + } + } -call_rcu (&mh->rcu, dlm_mhandle_release); +spin_lock (&node->send_queue_lock); +list_for_each_entry_rcu (mh, &node->send_queue, list) { +if (before (mh->seq, seq)) { +dlm_mhandle_delete (node, mh); }else {/* send queue should be ordered */ break ; } } +spin_unlock (&node->send_queue_lock);rcu_read_unlock (); }
Signature · 1 line
2.26.3
Alexander Aring
maintainerPATCH 2/2 fs: dlm: invalid buffer access in lookup error
This patch will evaluate the message length if a dlm opts header can fit in before accessing it if a node lookup fails. The invalid sequence error means that the version detection failed and an unexpected message arrived. For debugging such situation the type of arrived message is important to know.
Signed-off-by Alexander Aring <[email protected]>
--- fs/dlm/midcomms.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
fs/dlm/midcomms.c +17 -2
@@ -621,8 +621,23 @@ dlm_midcomms_recv_node_lookup(int nodeid, const union dlm_packet *p, node =nodeid2node (nodeid, allocation);if (!node) { -log_print_ratelimited ("received dlm message cmd %d nextcmd %d from node %d in an invalid sequence" , - p->header.h_cmd, p->opts.o_nextcmd, nodeid); +switch (p->header.h_cmd) { +case DLM_OPTS : +if (msglen <sizeof (struct dlm_opts )) { +log_print ("opts msg too small: %u, will skip this message from node %d" , + msglen, nodeid); +return NULL ; + } + +log_print_ratelimited ("received dlm opts message nextcmd %d from node %d in an invalid sequence" , + p->opts.o_nextcmd, nodeid); +break ; +default : +log_print_ratelimited ("received dlm message cmd %d from node %d in an invalid sequence" , + p->header.h_cmd, nodeid); +break ; + } +return NULL ; }
Signature · 1 line
2.26.3