Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next

[linux-2.6-block.git] / drivers / infiniband / core / uverbs_main.c

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index b21af1eaf5030c8b00003ccf102c79e5d3c8aef8..71ab83fde47292e95315c2170b00fec6277b7861 100644 (file)
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -503,6 +503,10 @@ void ib_uverbs_qp_event_handler(struct ib_event *event, void *context_ptr)
 {
        struct ib_uevent_object *uobj;
 
+       /* for XRC target qp's, check that qp is live */
+       if (!event->element.qp->uobject || !event->element.qp->uobject->live)
+               return;
+
        uobj = container_of(event->element.qp->uobject,
                            struct ib_uevent_object, uobject);