Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f469b262 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin Committed by Roland Dreier
Browse files

IB/ucm: Fix deadlock in cleanup 



ib_ucm_cleanup_events() holds file_mutex while calling ib_destroy_cm_id().
This can deadlock since ib_destroy_cm_id() flushes event handlers, and
ib_ucm_event_handler() needs file_mutex, too.  Therefore, drop the
file_mutex during the call to ib_destroy_cm_id().

Signed-off-by: default avatarMichael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent e1444b5a

drivers/infiniband/core/ucm.c

+2 −0
Original line number Diff line number Diff line
@@ -161,12 +161,14 @@ static void ib_ucm_cleanup_events(struct ib_ucm_context *ctx) 
				    struct ib_ucm_event, ctx_list);

		list_del(&uevent->file_list);

		list_del(&uevent->ctx_list);

		mutex_unlock(&ctx->file->file_mutex);



		/* clear incoming connections. */

		if (ib_ucm_new_cm_id(uevent->resp.event))

			ib_destroy_cm_id(uevent->cm_id);



		kfree(uevent);

		mutex_lock(&ctx->file->file_mutex);

	}

	mutex_unlock(&ctx->file->file_mutex);

}