mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Miaohe Lin <linmiaohe@huawei.com>
To: <axboe@kernel.dk>
Cc: <linux-block@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linmiaohe@huawei.com>
Subject: [PATCH] block: Fix potential page reference leak in __bio_iov_iter_get_pages()
Date: Tue, 1 Sep 2020 08:00:06 -0400	[thread overview]
Message-ID: <20200901120006.9545-1-linmiaohe@huawei.com> (raw)

When bio is full, __bio_iov_iter_get_pages() would return error directly
while left page reference still held in pages. Release these references.
Also advance the iov_iter according to what we have done successfully.

Fixes: 576ed9135489 ("block: use bio_add_page in bio_iov_iter_get_pages")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
 block/bio.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/block/bio.c b/block/bio.c
index a9931f23d933..e113073958cb 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1023,7 +1023,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 				put_page(page);
 		} else {
 			if (WARN_ON_ONCE(bio_full(bio, len)))
-                                return -EINVAL;
+				goto put_pages;
 			__bio_add_page(bio, page, len, offset);
 		}
 		offset = 0;
@@ -1031,6 +1031,19 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 
 	iov_iter_advance(iter, size);
 	return 0;
+
+put_pages:
+	/* Advance iov_iter to what we have done yet. */
+	iov_iter_advance(iter, size - left);
+	/* Put the page references still held by pages. */
+	for (; left > 0; left -= len, i++) {
+		struct page *page = pages[i];
+
+		len = min_t(size_t, PAGE_SIZE - offset, left);
+		put_page(page);
+		offset = 0;
+	}
+	return -EINVAL;
 }
 
 static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter)
-- 
2.19.1


             reply	other threads:[~2020-09-01 12:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-01 12:00 Miaohe Lin [this message]
2020-09-01 16:09 ` Christoph Hellwig
2020-09-02  1:46 linmiaohe

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=20200901120006.9545-1-linmiaohe@huawei.com \
    --to=linmiaohe@huawei.com \
    --cc=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.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®