From 7e609a80899dea337174242f62dd7c24a6a74716 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 22 May 2015 11:12:45 +0200 Subject: [PATCH] nvme: fail SCSI read/write command with unsupported protection bit Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe (cherry picked from commit 772ce43559e076730ddff5907fabcb3485545e38) Orabug: 22620486 Signed-off-by: Jason Luo --- drivers/block/nvme-scsi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/block/nvme-scsi.c b/drivers/block/nvme-scsi.c index 3b033b559935..55908e56beeb 100644 --- a/drivers/block/nvme-scsi.c +++ b/drivers/block/nvme-scsi.c @@ -1901,6 +1901,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) { -- 2.50.1