Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22fff826 authored Jan 20, 2012 by Dan Carpenter Committed by Matthew Wilcox Jul 31, 2012

NVMe: handle allocation failure in nvme_map_user_pages()



We should return here and avoid a NULL dereference.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>

parent c7d36ab8

drivers/block/nvme.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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) {