Skip to contentSkip to conversation

Patch "RDMA/uverbs: Initialize cq_context appropriately" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Aug 27, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

RDMA/uverbs: Initialize cq_context appropriately

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
rdma-uverbs-initialize-cq_context-appropriately.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 65159c051c45f269cf40a14f9404248f2d524920 Mon Sep 17 00:00:00 2001

From: Bharat Potnuri <[email protected]>
Date: Tue, 1 Aug 2017 10:58:35 +0530
Subject: RDMA/uverbs: Initialize cq_context appropriately

From: Bharat Potnuri <[email protected]>

commit 65159c051c45f269cf40a14f9404248f2d524920 upstream.

Initializing cq_context with ev_queue in create_cq(), leads to NULL pointer dereference in ib_uverbs_comp_handler(), if application doesnot use completion channel. This patch fixes the cq_context initialization.

Fixes 1e7710f3f65 ("IB/core: Change completion channel to use the reworked")
(cherry picked from commit 699a2d5b1b880b4e4e1c7d55fa25659322cf5b51)
---
 drivers/infiniband/core/uverbs_cmd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/core/uverbs_cmd.c +1 -1
@@ -1015,7 +1015,7 @@ static struct ib_ucq_object *create_cq(s
 	cq->uobject       = &obj->uobject;
 	cq->comp_handler  = ib_uverbs_comp_handler;
 	cq->event_handler = ib_uverbs_cq_event_handler;
-	cq->cq_context    = &ev_file->ev_queue;
+	cq->cq_context    = ev_file ? &ev_file->ev_queue : NULL;
 	atomic_set(&cq->usecnt, 0);
 
 	obj->uobject.object = cq;

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/rdma-uverbs-initialize-cq_context-appropriately.patch