diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-05-22 12:12:45 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-05-22 17:36:44 +0300 |
| commit | 772ce43559e076730ddff5907fabcb3485545e38 (patch) | |
| tree | 20169504b9f11360f720a7d90d00601458c0ecf1 /drivers/block/nvme-scsi.c | |
| parent | 908517684807f3b3d93893da78c7906f5ff2c49b (diff) | |
| download | linux-772ce43559e076730ddff5907fabcb3485545e38.tar.xz | |
nvme: fail SCSI read/write command with unsupported protection bit
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/nvme-scsi.c')
| -rw-r--r-- | drivers/block/nvme-scsi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c index f53da60b657d..342f5b7f840d 100644 --- a/drivers/block/nvme-scsi.c +++ b/drivers/block/nvme-scsi.c @@ -1900,6 +1900,13 @@ static int nvme_trans_io(struct nvme_ns *ns, struct sg_io_hdr *hdr, u8 is_write, default: cdb_info.fua = cmd[1] & 0x8; cdb_info.prot_info = (cmd[1] & 0xe0) >> 5; + if (cdb_info.prot_info && !ns->pi_type) { + return nvme_trans_completion(hdr, + SAM_STAT_CHECK_CONDITION, + ILLEGAL_REQUEST, + SCSI_ASC_INVALID_CDB, + SCSI_ASCQ_CAUSE_NOT_REPORTABLE); + } } switch (opcode) { |