d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for use-after-free when using delayed work structures in ibcore.

Browse Source 
It is not enough to cancel delayed work structures before freeing.
Always cancel delayed work synchronously before freeing!

MFC after:	1 week
Sponsored by:	Mellanox Technologies
This commit is contained in:
Hans Petter Selasky 2018-03-07 12:56:04 +00:00
parent 08fdb4ce38
commit 03ae76a693
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/ofed/drivers/infiniband/core/ib_cm.c
View File

@ -4132,6 +4132,7 @@ static void __exit ib_cm_cleanup(void)
destroy_workqueue(cm.wq);
list_for_each_entry_safe(timewait_info, tmp, &cm.timewait_list, list) {
cancel_delayed_work_sync(&timewait_info->work.work);
list_del(&timewait_info->list);
kfree(timewait_info);
}

2
sys/ofed/drivers/infiniband/core/ib_mad.c
View File

@ -572,7 +572,7 @@ static void unregister_mad_agent(struct ib_mad_agent_private *mad_agent_priv)
*/
cancel_mads(mad_agent_priv);
port_priv = mad_agent_priv->qp_info->port_priv;
cancel_delayed_work(&mad_agent_priv->timed_work);
cancel_delayed_work_sync(&mad_agent_priv->timed_work);
spin_lock_irqsave(&port_priv->reg_lock, flags);
remove_mad_reg_req(mad_agent_priv);

4
sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
View File

@ -103,8 +103,8 @@ void ib_cancel_rmpp_recvs(struct ib_mad_agent_private *agent)
spin_unlock_irqrestore(&agent->lock, flags);
list_for_each_entry(rmpp_recv, &agent->rmpp_list, list) {
cancel_delayed_work(&rmpp_recv->timeout_work);
cancel_delayed_work(&rmpp_recv->cleanup_work);
cancel_delayed_work_sync(&rmpp_recv->timeout_work);
cancel_delayed_work_sync(&rmpp_recv->cleanup_work);
}
flush_workqueue(agent->qp_info->port_priv->wq);