1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 9f30f9bffc61..e2e8d329b443 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -213,7 +213,17 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id,
                         goto out;
                 }
                 ctx->backlog--;
+        } else if (!ctx->uid) {
+                /*
+                 * We ignore events for new connections until userspace has set
+                 * their context.  This can only happen if an error occurs on a
+                 * new connection before the user accepts it.  This is okay,
+                 * since the accept will just fail later.
+                 */
+                kfree(uevent);
+                goto out;
         }
+
         list_add_tail(&uevent->list, &ctx->file->event_list);
         wake_up_interruptible(&ctx->file->poll_wait);
 out: