From: Ming Lei <ming.lei@redhat.com>
To: linux-nvme@lists.infradead.org, Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>, Yi Zhang <yi.zhang@redhat.com>,
Sagi Grimberg <sagi@grimberg.me>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>,
stable@vger.kernel.org
Subject: [PATCH 3/4] nvmet: fix computation of bvec->bv_len
Date: Tue, 26 Mar 2019 11:19:27 +0800 [thread overview]
Message-ID: <20190326031928.9499-4-ming.lei@redhat.com> (raw)
In-Reply-To: <20190326031928.9499-1-ming.lei@redhat.com>
PAGE_SIZE - sg->offset may be bigger than sg->length, so we have
to cap it.
Reported-by: Yi Zhang <yi.zhang@redhat.com>
Fixes: d5eff33ee6f8("nvmet: add simple file backed ns support")
Cc: Yi Zhang <yi.zhang@redhat.com>
Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
drivers/nvme/target/io-cmd-file.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c
index d67a43832cb1..149e17e699e5 100644
--- a/drivers/nvme/target/io-cmd-file.c
+++ b/drivers/nvme/target/io-cmd-file.c
@@ -79,7 +79,8 @@ static void nvmet_file_init_bvec(struct bio_vec *bv, struct sg_page_iter *iter)
{
bv->bv_page = sg_page_iter_page(iter);
bv->bv_offset = iter->sg->offset;
- bv->bv_len = PAGE_SIZE - iter->sg->offset;
+ bv->bv_len = min_t(unsigned, PAGE_SIZE - iter->sg->offset,
+ iter->sg->length);
}
static ssize_t nvmet_file_submit_bvec(struct nvmet_req *req, loff_t pos,
--
2.9.5
prev parent reply other threads:[~2019-03-26 3:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190326031928.9499-1-ming.lei@redhat.com>
2019-03-26 3:19 ` [PATCH 1/4] nvmet: set loop queue's segment boundary mask as PAGE_SIZE - 1 Ming Lei
2019-03-26 7:36 ` Christoph Hellwig
2019-03-26 7:37 ` Ming Lei
2019-03-26 7:39 ` Ming Lei
2019-03-27 8:15 ` Christoph Hellwig
2019-03-27 8:26 ` Ming Lei
2019-03-27 8:39 ` Christoph Hellwig
2019-03-26 3:19 ` [PATCH 2/4] nvmet: fix computation of io vector number Ming Lei
2019-03-26 7:38 ` Christoph Hellwig
2019-03-26 7:50 ` Ming Lei
2019-03-27 8:15 ` Christoph Hellwig
2019-03-26 3:19 ` Ming Lei [this message]
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=20190326031928.9499-4-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=chaitanya.kulkarni@wdc.com \
--cc=hch@lst.de \
--cc=linux-nvme@lists.infradead.org \
--cc=sagi@grimberg.me \
--cc=stable@vger.kernel.org \
--cc=yi.zhang@redhat.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