Переглянути джерело

[PATCH] IB: fix use-after-free in user verbs cleanup

Fix a use-after-free bug in userspace verbs cleanup: we can't touch
mr->device after we free mr by calling ib_dereg_mr().

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Roland Dreier 20 роки тому
батько
коміт
e1bcfcaa0b
1 змінених файлів з 2 додано та 1 видалено
  1. 2 1
      drivers/infiniband/core/uverbs_main.c

+ 2 - 1
drivers/infiniband/core/uverbs_main.c

@@ -130,13 +130,14 @@ static int ib_dealloc_ucontext(struct ib_ucontext *context)
 
 
 	list_for_each_entry_safe(uobj, tmp, &context->mr_list, list) {
 	list_for_each_entry_safe(uobj, tmp, &context->mr_list, list) {
 		struct ib_mr *mr = idr_find(&ib_uverbs_mr_idr, uobj->id);
 		struct ib_mr *mr = idr_find(&ib_uverbs_mr_idr, uobj->id);
+		struct ib_device *mrdev = mr->device;
 		struct ib_umem_object *memobj;
 		struct ib_umem_object *memobj;
 
 
 		idr_remove(&ib_uverbs_mr_idr, uobj->id);
 		idr_remove(&ib_uverbs_mr_idr, uobj->id);
 		ib_dereg_mr(mr);
 		ib_dereg_mr(mr);
 
 
 		memobj = container_of(uobj, struct ib_umem_object, uobject);
 		memobj = container_of(uobj, struct ib_umem_object, uobject);
-		ib_umem_release_on_close(mr->device, &memobj->umem);
+		ib_umem_release_on_close(mrdev, &memobj->umem);
 
 
 		list_del(&uobj->list);
 		list_del(&uobj->list);
 		kfree(memobj);
 		kfree(memobj);