]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
nvmet: check fileio lba range access boundaries
authorSagi Grimberg <sagi@grimberg.me>
Wed, 11 Jul 2018 13:13:04 +0000 (16:13 +0300)
committerChristoph Hellwig <hch@lst.de>
Tue, 24 Jul 2018 13:55:51 +0000 (15:55 +0200)
Fail out-of-bounds with a proper status code.

Fixes: d5eff33ee6f8 ("nvmet: add simple file backed ns support")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/target/io-cmd-file.c

index dad8d44bf90e85a89ac0115efd9992fa297c4678..c2d0d08b59c8e1153f9bbc1863350020fcc04452 100644 (file)
@@ -145,6 +145,12 @@ static void nvmet_file_execute_rw(struct nvmet_req *req)
                return;
        }
 
+       pos = le64_to_cpu(req->cmd->rw.slba) << req->ns->blksize_shift;
+       if (unlikely(pos + req->data_len > req->ns->size)) {
+               nvmet_req_complete(req, NVME_SC_LBA_RANGE | NVME_SC_DNR);
+               return;
+       }
+
        if (nr_bvec > NVMET_MAX_INLINE_BIOVEC)
                req->f.bvec = kmalloc_array(nr_bvec, sizeof(struct bio_vec),
                                GFP_KERNEL);
@@ -160,8 +166,6 @@ static void nvmet_file_execute_rw(struct nvmet_req *req)
                        is_sync = true;
        }
 
-       pos = le64_to_cpu(req->cmd->rw.slba) << req->ns->blksize_shift;
-
        memset(&req->f.iocb, 0, sizeof(struct kiocb));
        for_each_sg_page(req->sg, &sg_pg_iter, req->sg_cnt, 0) {
                nvmet_file_init_bvec(&req->f.bvec[bv_cnt], &sg_pg_iter);
@@ -236,8 +240,14 @@ static void nvmet_file_execute_discard(struct nvmet_req *req)
                                        sizeof(range));
                if (ret)
                        break;
+
                offset = le64_to_cpu(range.slba) << req->ns->blksize_shift;
                len = le32_to_cpu(range.nlb) << req->ns->blksize_shift;
+               if (offset + len > req->ns->size) {
+                       ret = NVME_SC_LBA_RANGE | NVME_SC_DNR;
+                       break;
+               }
+
                if (vfs_fallocate(req->ns->file, mode, offset, len)) {
                        ret = NVME_SC_INTERNAL | NVME_SC_DNR;
                        break;
@@ -283,6 +293,11 @@ static void nvmet_file_write_zeroes_work(struct work_struct *w)
        len = (((sector_t)le16_to_cpu(write_zeroes->length) + 1) <<
                        req->ns->blksize_shift);
 
+       if (unlikely(offset + len > req->ns->size)) {
+               nvmet_req_complete(req, NVME_SC_LBA_RANGE | NVME_SC_DNR);
+               return;
+       }
+
        ret = vfs_fallocate(req->ns->file, mode, offset, len);
        nvmet_req_complete(req, ret < 0 ? NVME_SC_INTERNAL | NVME_SC_DNR : 0);
 }