summaryrefslogtreecommitdiff
path: root/drivers/lightnvm
diff options
context:
space:
mode:
authorJavier Gonzalez <javier@javigon.com>2016-01-12 07:49:17 +0100
committerJens Axboe <axboe@fb.com>2016-01-12 08:21:16 -0700
commit3bfbc6adbc5031e8a5907baa5beb27b41637742a (patch)
treed42026273ff620c22cd85e18e07069f05578c4a7 /drivers/lightnvm
parentbdded1552085b12d23c9be76147d2e96647a098f (diff)
lightnvm: add check after mempool allocation
The mempool allocation might fail. Make sure to return error when it does, instead of causing a kernel panic. Signed-off-by: Javier Gonzalez <javier@cnexlabs.com> Signed-off-by: Matias Bjørling <m@bjorling.me> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm')
-rw-r--r--drivers/lightnvm/rrpc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index a1e7488c1f3e..f4bc98687d7f 100644
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -287,6 +287,8 @@ static int rrpc_move_valid_pages(struct rrpc *rrpc, struct rrpc_block *rblk)
}
page = mempool_alloc(rrpc->page_pool, GFP_NOIO);
+ if (!page)
+ return -ENOMEM;
while ((slot = find_first_zero_bit(rblk->invalid_pages,
nr_pgs_per_blk)) < nr_pgs_per_blk) {