Commit 8406a4d5 authored by Chao Yu's avatar Chao Yu Committed by Jens Axboe

elevator: fix double release of elevator module

Our issue is descripted in below call path:
->elevator_init
 ->elevator_init_fn
  ->{cfq,deadline,noop}_init_queue
   ->elevator_alloc
    ->kzalloc_node
   fail to call kzalloc_node and then put module in elevator_alloc;
fail to call elevator_init_fn and then put module again in elevator_init.

Remove elevator_put invoking in error path of elevator_alloc to avoid
double release issue.
Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 464d1387
...@@ -157,7 +157,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q, ...@@ -157,7 +157,7 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,
eq = kzalloc_node(sizeof(*eq), GFP_KERNEL, q->node); eq = kzalloc_node(sizeof(*eq), GFP_KERNEL, q->node);
if (unlikely(!eq)) if (unlikely(!eq))
goto err; return NULL;
eq->type = e; eq->type = e;
kobject_init(&eq->kobj, &elv_ktype); kobject_init(&eq->kobj, &elv_ktype);
...@@ -165,10 +165,6 @@ struct elevator_queue *elevator_alloc(struct request_queue *q, ...@@ -165,10 +165,6 @@ struct elevator_queue *elevator_alloc(struct request_queue *q,
hash_init(eq->hash); hash_init(eq->hash);
return eq; return eq;
err:
kfree(eq);
elevator_put(e);
return NULL;
} }
EXPORT_SYMBOL(elevator_alloc); EXPORT_SYMBOL(elevator_alloc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment