1 files changed, 6 insertions, 1 deletions

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index b9abdca84c17..5da8e6e9ab4b 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -3590,6 +3590,11 @@ retry:
 
         blkcg = bio_blkcg(bio);
         cfqg = cfq_lookup_create_cfqg(cfqd, blkcg);
+        if (!cfqg) {
+                cfqq = &cfqd->oom_cfqq;
+                goto out;
+        }
+
         cfqq = cic_to_cfqq(cic, is_sync);
 
         /*
@@ -3626,7 +3631,7 @@ retry:
                 } else
                         cfqq = &cfqd->oom_cfqq;
         }
-
+out:
         if (new_cfqq)
                 kmem_cache_free(cfq_pool, new_cfqq);