lightnvm: add check after mempool allocation
diff mbox

Message ID 1450181195-24702-1-git-send-email-javier@javigon.com
State New
Headers show

Commit Message

Javier González Dec. 15, 2015, 12:06 p.m. UTC
Add missing check after mempool allocation.

Signed-off-by: Javier Gonzalez <javier@cnexlabs.com>
---
 drivers/lightnvm/rrpc.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Matias Bjorling Dec. 15, 2015, 12:11 p.m. UTC | #1
On 12/15/2015 01:06 PM, Javier Gonzalez wrote:
> Add missing check after mempool allocation.
>
> Signed-off-by: Javier Gonzalez <javier@cnexlabs.com>
> ---
>   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.
--
To unsubscribe from this list: send the line "unsubscribe linux-block" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

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) {