On Sun, Jun 9, 2019 at 12:50 AM Ming Lei <[email protected]> wrote:
>
> Different iovec may use one same page, then 'pages' array filled
> by iov_iter_get_pages() may get reference of the same page several
> times. If some page in 'pages' can be merged to same page in one bvec
> by bio_add_page(), bio_release_pages() only drops the page's reference
> once.
>
> This way causes page leak reported by David Gibson.
>
> This issue can be triggered since 576ed913 ("block: use bio_add_page in
> bio_iov_iter_get_pages").
>
> Fixes the issue by put the page's ref if it is merged to same page.
>
> Cc: David Gibson <[email protected]>
> Cc: "Darrick J. Wong" <[email protected]>
> Cc: [email protected]
> Cc: Alexander Viro <[email protected]>
> Cc: Christoph Hellwig <[email protected]>
> Link: https://lkml.org/lkml/2019/4/23/64
> Fixes: 576ed913 ("block: use bio_add_page in bio_iov_iter_get_pages")
> Reported-by: David Gibson <[email protected]>
> Signed-off-by: Ming Lei <[email protected]>
> ---
>  block/bio.c         | 14 ++++++++++++--
>  include/linux/bio.h |  1 +
>  2 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/block/bio.c b/block/bio.c
> index 39e3b931dc3b..5f7b46360c36 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -657,6 +657,10 @@ static inline bool page_is_mergeable(const struct 
> bio_vec *bv,
>         WARN_ON_ONCE((flags & BVEC_MERGE_TO_SAME_PAGE) &&
>                         (len + off) > PAGE_SIZE);
>
> +       if ((flags & BVEC_MERGE_PUT_SAME_PAGE) &&
> +                       (flags & BVEC_MERGE_TO_SAME_PAGE))
> +               put_page(page);
> +
>         return true;
>  }
>
> @@ -924,8 +928,14 @@ static int __bio_iov_iter_get_pages(struct bio *bio, 
> struct iov_iter *iter)
>                 struct page *page = pages[i];
>
>                 len = min_t(size_t, PAGE_SIZE - offset, left);
> -               if (WARN_ON_ONCE(bio_add_page(bio, page, len, offset) != len))
> -                       return -EINVAL;
> +
> +               if (!__bio_try_merge_page(bio, page, len, offset,
> +                                       BVEC_MERGE_PUT_SAME_PAGE |
> +                                       BVEC_MERGE_TO_SAME_PAGE)) {

oops, it is wrong to pass  BVEC_MERGE_TO_SAME_PAGE here, which
should disable multi-page merge.

Please ignore this patchset, and will fix it in V2.


Thanks,
Ming Lei

Reply via email to