mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ming Lei <ming.lei@redhat.com>
To: Andreas Gruenbacher <agruenba@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Junichi Nomura <j-nomura@ce.jp.nec.com>,
	Christoph Hellwig <hch@lst.de>, Hannes Reinecke <hare@suse.de>,
	linux-block@vger.kernel.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org
Subject: Re: [PATCH] block: fix "check bi_size overflow before merge"
Date: Tue, 10 Dec 2019 10:12:10 +0800	[thread overview]
Message-ID: <20191210021210.GB25022@ming.t460p> (raw)
In-Reply-To: <20191209191114.17266-1-agruenba@redhat.com>

On Mon, Dec 09, 2019 at 08:11:14PM +0100, Andreas Gruenbacher wrote:
> This partially reverts commit e3a5d8e386c3fb973fa75f2403622a8f3640ec06.
> 
> Commit e3a5d8e386c3 ("check bi_size overflow before merge") adds a bio_full
> check to __bio_try_merge_page.  This will cause __bio_try_merge_page to fail
> when the last bi_io_vec has been reached.  Instead, what we want here is only
> the bi_size overflow check.
> 
> Fixes: e3a5d8e386c3 ("block: check bi_size overflow before merge")
> Cc: stable@vger.kernel.org # v5.4+
> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
> ---
>  block/bio.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/block/bio.c b/block/bio.c
> index 9d54aa37ce6c..a5d75f6bf4c7 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -754,10 +754,12 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page,
>  	if (WARN_ON_ONCE(bio_flagged(bio, BIO_CLONED)))
>  		return false;
>  
> -	if (bio->bi_vcnt > 0 && !bio_full(bio, len)) {
> +	if (bio->bi_vcnt > 0) {
>  		struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];
>  
>  		if (page_is_mergeable(bv, page, len, off, same_page)) {
> +			if (bio->bi_iter.bi_size > UINT_MAX - len)
> +				return false;
>  			bv->bv_len += len;
>  			bio->bi_iter.bi_size += len;
>  			return true;

page merging doesn't consume new bvec, so this patch is correct:

Reviewed-by: Ming Lei <ming.lei@redhat.com>

Thanks,
Ming


  reply	other threads:[~2019-12-10  2:12 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-09 19:11 Andreas Gruenbacher
2019-12-10  2:12 ` Ming Lei [this message]
2019-12-10  5:04 ` Jens Axboe

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191210021210.GB25022@ming.t460p \
    --to=ming.lei@redhat.com \
    --cc=agruenba@redhat.com \
    --cc=axboe@kernel.dk \
    --cc=hare@suse.de \
    --cc=hch@lst.de \
    --cc=j-nomura@ce.jp.nec.com \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®