From: Kent Overstreet <kmo@daterainc.com>
To: axboe@kernel.dk
Cc: linux-kernel@vger.kernel.org, hch@infradead.org, tj@kernel.org,
nab@linux-iscsi.org, Kent Overstreet <kmo@daterainc.com>
Subject: [PATCH 01/23] block: Use rw_copy_check_uvector()
Date: Tue, 29 Oct 2013 13:17:54 -0700 [thread overview]
Message-ID: <1383077896-4132-2-git-send-email-kmo@daterainc.com> (raw)
In-Reply-To: <1383077896-4132-1-git-send-email-kmo@daterainc.com>
No need for silly open coding - and struct sg_iovec has exactly the same
layout as struct iovec...
Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
---
block/scsi_ioctl.c | 39 ++++++++++-----------------------------
1 file changed, 10 insertions(+), 29 deletions(-)
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index a5ffcc9..625e3e4 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -286,7 +286,8 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
struct sg_io_hdr *hdr, fmode_t mode)
{
unsigned long start_time;
- int writing = 0, ret = 0;
+ ssize_t ret = 0;
+ int writing = 0;
struct request *rq;
char sense[SCSI_SENSE_BUFFERSIZE];
struct bio *bio;
@@ -321,37 +322,16 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
}
if (hdr->iovec_count) {
- const int size = sizeof(struct sg_iovec) * hdr->iovec_count;
size_t iov_data_len;
- struct sg_iovec *sg_iov;
struct iovec *iov;
- int i;
- sg_iov = kmalloc(size, GFP_KERNEL);
- if (!sg_iov) {
- ret = -ENOMEM;
+ ret = rw_copy_check_uvector(-1, hdr->dxferp, hdr->iovec_count,
+ 0, NULL, &iov);
+ if (ret < 0)
goto out;
- }
-
- if (copy_from_user(sg_iov, hdr->dxferp, size)) {
- kfree(sg_iov);
- ret = -EFAULT;
- goto out;
- }
- /*
- * Sum up the vecs, making sure they don't overflow
- */
- iov = (struct iovec *) sg_iov;
- iov_data_len = 0;
- for (i = 0; i < hdr->iovec_count; i++) {
- if (iov_data_len + iov[i].iov_len < iov_data_len) {
- kfree(sg_iov);
- ret = -EINVAL;
- goto out;
- }
- iov_data_len += iov[i].iov_len;
- }
+ iov_data_len = ret;
+ ret = 0;
/* SG_IO howto says that the shorter of the two wins */
if (hdr->dxfer_len < iov_data_len) {
@@ -361,9 +341,10 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
iov_data_len = hdr->dxfer_len;
}
- ret = blk_rq_map_user_iov(q, rq, NULL, sg_iov, hdr->iovec_count,
+ ret = blk_rq_map_user_iov(q, rq, NULL, (struct sg_iovec *) iov,
+ hdr->iovec_count,
iov_data_len, GFP_KERNEL);
- kfree(sg_iov);
+ kfree(iov);
} else if (hdr->dxfer_len)
ret = blk_rq_map_user(q, rq, NULL, hdr->dxferp, hdr->dxfer_len,
GFP_KERNEL);
--
1.8.4.rc3
next prev parent reply other threads:[~2013-10-29 20:18 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-29 20:17 [PATCH] Immutable biovecs Kent Overstreet
2013-10-29 20:17 ` Kent Overstreet [this message]
2013-10-29 20:17 ` [PATCH 02/23] block: Consolidate duplicated bio_trim() implementations Kent Overstreet
2013-10-29 20:17 ` [PATCH 03/23] bcache: Kill unaligned bvec hack Kent Overstreet
2013-10-29 20:17 ` [PATCH 05/23] dm: Use bvec_iter for dm_bio_record() Kent Overstreet
2013-10-29 20:17 ` [PATCH 06/23] block: Convert bio_iovec() to bvec_iter Kent Overstreet
2013-10-29 20:18 ` [PATCH 08/23] block: Immutable bio vecs Kent Overstreet
2013-10-29 20:18 ` [PATCH 09/23] block: Convert bio_copy_data() to bvec_iter Kent Overstreet
2013-10-29 20:18 ` [PATCH 10/23] bio-integrity: Convert " Kent Overstreet
2013-10-29 20:18 ` [PATCH 11/23] block: Kill bio_segments()/bi_vcnt usage Kent Overstreet
2013-10-29 20:18 ` [PATCH 12/23] block: Convert drivers to immutable biovecs Kent Overstreet
2013-10-29 20:18 ` [PATCH 13/23] aoe: Convert " Kent Overstreet
2013-10-29 20:18 ` [PATCH 14/23] ceph: " Kent Overstreet
2013-10-29 20:18 ` [PATCH 15/23] block: Kill bio_iovec_idx(), __bio_iovec() Kent Overstreet
2013-10-29 20:18 ` [PATCH 16/23] rbd: Refactor bio cloning, don't clone biovecs Kent Overstreet
2013-10-29 20:18 ` [PATCH 17/23] dm: Refactor for new bio cloning/splitting Kent Overstreet
2013-10-29 23:04 ` Mike Snitzer
2013-10-30 0:09 ` Mike Snitzer
2013-10-30 0:19 ` Kent Overstreet
2013-10-30 0:29 ` Mike Snitzer
2013-10-31 14:05 ` Jens Axboe
2013-10-29 20:18 ` [PATCH 18/23] block: Remove bi_idx hacks Kent Overstreet
2013-10-29 20:18 ` [PATCH 19/23] block: Generic bio chaining Kent Overstreet
2013-10-29 20:18 ` [PATCH 20/23] block: Rename bio_split() -> bio_pair_split() Kent Overstreet
2013-10-29 20:18 ` [PATCH 21/23] block: Introduce new bio_split() Kent Overstreet
2013-10-29 20:18 ` [PATCH 22/23] block: Kill bio_pair_split() Kent Overstreet
2013-10-29 20:18 ` [PATCH 23/23] block: Don't save/copy bvec array anymore, share when cloning Kent Overstreet
2013-10-29 20:36 ` [PATCH] Immutable biovecs Jens Axboe
2013-10-30 0:06 ` Kent Overstreet
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=1383077896-4132-2-git-send-email-kmo@daterainc.com \
--to=kmo@daterainc.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=tj@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
Powered by JetHome