linux-kernel - Re: [PATCH] lightnvm: pblk: Fix freeing merged pages

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <C02560B2-DD7F-4B59-8E63-8A06E5DF2271@javigon.com>
Date:   Wed, 15 May 2019 11:12:02 +0200
From:   Javier González <javier@...igon.com>
To:     Heiner Litz <hlitz@...c.edu>
Cc:     Matias Bjørling <mb@...htnvm.io>,
        Hans Holmberg <hans.holmberg@...xlabs.com>,
        "Konopko, Igor J" <igor.j.konopko@...el.com>,
        linux-block@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] lightnvm: pblk: Fix freeing merged pages

> On 15 May 2019, at 02.39, Heiner Litz <hlitz@...c.edu> wrote:
> 
> bio_add_pc_page() may merge pages when a bio is padded due to a flush.
> Fix iteration over the bio to free the correct pages in case of a merge.
> 
> Signed-off-by: Heiner Litz <hlitz@...c.edu>
> ---
> drivers/lightnvm/pblk-core.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
> index 773537804319..88d61b27a9ab 100644
> --- a/drivers/lightnvm/pblk-core.c
> +++ b/drivers/lightnvm/pblk-core.c
> @@ -323,14 +323,16 @@ void pblk_free_rqd(struct pblk *pblk, struct nvm_rq *rqd, int type)
> void pblk_bio_free_pages(struct pblk *pblk, struct bio *bio, int off,
> 			 int nr_pages)
> {
> -	struct bio_vec bv;
> -	int i;
> -
> -	WARN_ON(off + nr_pages != bio->bi_vcnt);
> -
> -	for (i = off; i < nr_pages + off; i++) {
> -		bv = bio->bi_io_vec[i];
> -		mempool_free(bv.bv_page, &pblk->page_bio_pool);
> +	struct bio_vec *bv;
> +	struct page *page;
> +	int i,e, nbv = 0;
> +
> +	for (i = 0; i < bio->bi_vcnt; i++) {
> +		bv = &bio->bi_io_vec[i];
> +		page = bv->bv_page;
> +		for (e = 0; e < bv->bv_len; e += PBLK_EXPOSED_PAGE_SIZE, nbv++)
> +			if (nbv >= off)
> +				mempool_free(page++, &pblk->page_bio_pool);
> 	}
> }
> 
> --
> 2.17.1

Looks good to me.

Reviewed-by: Javier González <javier@...igon.com>


Download attachment "signature.asc" of type "application/pgp-signature" (834 bytes)