From: Miaohe Lin <linmiaohe@huawei.com>
To: <axboe@kernel.dk>, <martin.petersen@oracle.com>,
<kbusch@kernel.org>, <johannes.thumshirn@wdc.com>, <hare@suse.de>
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_append_get_pages()
Date: Sat, 5 Sep 2020 05:40:06 -0400 [thread overview]
Message-ID: <20200905094006.1925-1-linmiaohe@huawei.com> (raw)
When bio_add_hw_page() failed, we left page reference still held in pages.
Release these references and advance the iov_iter according to what we
have done successfully yet.
Fixes: 0512a75b98f8 ("block: Introduce REQ_OP_ZONE_APPEND")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
block/bio.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/block/bio.c b/block/bio.c
index e113073958cb..a323a5446221 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1080,7 +1080,7 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter)
len = min_t(size_t, PAGE_SIZE - offset, left);
if (bio_add_hw_page(q, bio, page, len, offset,
max_append_sectors, &same_page) != len)
- return -EINVAL;
+ goto put_pages;
if (same_page)
put_page(page);
offset = 0;
@@ -1088,6 +1088,16 @@ static int __bio_iov_append_get_pages(struct bio *bio, struct iov_iter *iter)
iov_iter_advance(iter, size);
return 0;
+put_pages:
+ iov_iter_advance(iter, size - left);
+ 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;
}
/**
--
2.19.1
next reply other threads:[~2020-09-05 9:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 9:40 Miaohe Lin [this message]
2020-09-09 7:09 ` Johannes Thumshirn
2020-09-09 7:21 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=20200905094006.1925-1-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=johannes.thumshirn@wdc.com \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/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®