Author: hselasky
Date: Wed Mar 7 12:56:04 2018
New Revision: 330579
URL: https://svnweb.freebsd.org/changeset/base/330579
Log:
Fix for use-after-free when using delayed work structures in ibcore.
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
Modified:
head/sys/ofed/drivers/infiniband/core/ib_cm.c
head/sys/ofed/drivers/infiniband/core/ib_mad.c
head/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
Modified: head/sys/ofed/drivers/infiniband/core/ib_cm.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/ib_cm.c Wed Mar 7 11:09:07
2018 (r330578)
+++ head/sys/ofed/drivers/infiniband/core/ib_cm.c Wed Mar 7 12:56:04
2018 (r330579)
@@ -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);
}
Modified: head/sys/ofed/drivers/infiniband/core/ib_mad.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/ib_mad.c Wed Mar 7 11:09:07
2018 (r330578)
+++ head/sys/ofed/drivers/infiniband/core/ib_mad.c Wed Mar 7 12:56:04
2018 (r330579)
@@ -572,7 +572,7 @@ static void unregister_mad_agent(struct ib_mad_agent_p
*/
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);
Modified: head/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c Wed Mar 7 11:09:07
2018 (r330578)
+++ head/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c Wed Mar 7 12:56:04
2018 (r330579)
@@ -103,8 +103,8 @@ void ib_cancel_rmpp_recvs(struct ib_mad_agent_private
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);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
