---

yaml --- r: 323251 b: refs/heads/master c: 22fff82 h: refs/heads/master i: 323249: 6dcdc40 323247: ba018fd v: v3
git-mirror · Jul 31, 2012 · db22ffe · db22ffe
1 parent 76af4f0
commit db22ffe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7d36ab8fa04c213328119a9c0d66985fe204ee5
+refs/heads/master: 22fff826e715e9727d3c7a69f15e602a9801b673
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
@@ -1044,6 +1044,8 @@ static struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
 	offset = offset_in_page(addr);
 	count = DIV_ROUND_UP(offset + length, PAGE_SIZE);
 	pages = kcalloc(count, sizeof(*pages), GFP_KERNEL);
+	if (!pages)
+		return ERR_PTR(-ENOMEM);
 
 	err = get_user_pages_fast(addr, count, 1, pages);
 	if (err < count) {