summaryrefslogtreecommitdiffstats
path: root/drivers/block/null_blk.c
diff options
context:
space:
mode:
authorMing Lei <tom.leiming@gmail.com>2014-05-01 15:12:36 +0800
committerJens Axboe <axboe@fb.com>2014-05-01 09:17:41 -0600
commitfc27691f3537a0df087214322467b642d1f6dedb (patch)
tree9b2060931a6776ec3e2bffce0adcba04643d0ec3 /drivers/block/null_blk.c
parentec4a340789be16831ae96be5f7552238a7a6e903 (diff)
downloadlinux-stable-fc27691f3537a0df087214322467b642d1f6dedb.tar.gz
linux-stable-fc27691f3537a0df087214322467b642d1f6dedb.tar.bz2
linux-stable-fc27691f3537a0df087214322467b642d1f6dedb.zip
block: null_blk: fix use after free
entry(cmd->ll_list) may belong to new request once end_cmd() returns, so fix the bug with the patch. Without the change, it is easy to observe oops when doing null_blk(timer) test. Signed-off-by: Ming Lei <tom.leiming@gmail.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/null_blk.c')
-rw-r--r--drivers/block/null_blk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 8e7e3a0b0d24..e932398588aa 100644
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -203,8 +203,8 @@ static enum hrtimer_restart null_cmd_timer_expired(struct hrtimer *timer)
entry = llist_reverse_order(entry);
do {
cmd = container_of(entry, struct nullb_cmd, ll_list);
- end_cmd(cmd);
entry = entry->next;
+ end_cmd(cmd);
} while (entry);
}