block, bfq: don't dereference bic before null checking it

[mirror_ubuntu-bionic-kernel.git] / block / bfq-iosched.c

diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index 6d14f18c0d45a9188068d8de39ec748d6e1c042e..bd8499ef157ce8786c6eaa164448eb0bf9e84c6c 100644 (file)
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -4401,11 +4401,11 @@ static int bfq_get_rq_private(struct request_queue *q, struct request *rq,
 
        spin_lock_irq(&bfqd->lock);
 
-       bfq_check_ioprio_change(bic, bio);
-
        if (!bic)
                goto queue_fail;
 
+       bfq_check_ioprio_change(bic, bio);
+
        bfq_bic_update_cgroup(bic, bio);
 
        bfqq = bfq_get_bfqq_handle_split(bfqd, bic, bio, false, is_sync,