All of lore.kernel.org
 help / color / mirror / Atom feed
From: Damien Le Moal <damien.lemoal@wdc.com>
To: linux-fsdevel@vger.kernel.org
Cc: Johannes Thumshirn <johannes.thumshirn@wdc.com>,
	Christoph Hellwig <hch@lst.de>
Subject: [PATCH] zonefs: fix page reference and BIO leak
Date: Wed,  9 Dec 2020 20:37:38 +0900	[thread overview]
Message-ID: <20201209113738.300930-1-damien.lemoal@wdc.com> (raw)

In zonefs_file_dio_append(), the pages obtained using
bio_iov_iter_get_pages() are not released on completion of the
REQ_OP_APPEND BIO and when bio_iov_iter_get_pages() fails. Fix this by
adding the missing calls to bio_release_pages() before returning.
Furthermore, a call to bio_put() is missing when
bio_iov_iter_get_pages() fails. Add it to avoid leaking the BIO
allocated. The call to bio_io_error() is removed from this error path
as the error code is returned directly to the caller.

Reported-by: Christoph Hellwig <hch@lst.de>
Fixes: 02ef12a663c7 ("zonefs: use REQ_OP_ZONE_APPEND for sync DIO")
Cc: stable@vger.kernel.org
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
---
 fs/zonefs/super.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/zonefs/super.c b/fs/zonefs/super.c
index ff5930be096c..eb5d1db018e1 100644
--- a/fs/zonefs/super.c
+++ b/fs/zonefs/super.c
@@ -692,7 +692,8 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
 
 	ret = bio_iov_iter_get_pages(bio, from);
 	if (unlikely(ret)) {
-		bio_io_error(bio);
+		bio_release_pages(bio, false);
+		bio_put(bio);
 		return ret;
 	}
 	size = bio->bi_iter.bi_size;
@@ -703,6 +704,7 @@ static ssize_t zonefs_file_dio_append(struct kiocb *iocb, struct iov_iter *from)
 
 	ret = submit_bio_wait(bio);
 
+	bio_release_pages(bio, false);
 	bio_put(bio);
 
 	zonefs_file_write_dio_end_io(iocb, size, ret, 0);
-- 
2.28.0


             reply	other threads:[~2020-12-09 11:39 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-09 11:37 Damien Le Moal [this message]
2020-12-09 18:11 ` [PATCH] zonefs: fix page reference and BIO leak Christoph Hellwig

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=20201209113738.300930-1-damien.lemoal@wdc.com \
    --to=damien.lemoal@wdc.com \
    --cc=hch@lst.de \
    --cc=johannes.thumshirn@wdc.com \
    --cc=linux-fsdevel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.