2015-12-15 12:07:07

by Javier González

Subject: [PATCH] lightnvm: add check after mempool allocation

Add missing check after mempool allocation.

Signed-off-by: Javier Gonzalez <[email protected]>
---
drivers/lightnvm/rrpc.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index a1e7488..f4bc986 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) {
--
2.1.4

2015-12-15 12:11:13

by Matias Bjørling

Subject: Re: [PATCH] lightnvm: add check after mempool allocation

On 12/15/2015 01:06 PM, Javier Gonzalez wrote:
> Add missing check after mempool allocation.
>
> Signed-off-by: Javier Gonzalez <[email protected]>
> ---
> drivers/lightnvm/rrpc.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
> index a1e7488..f4bc986 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) {
>
Thanks Javier, applied for 4.5.