[SCSI] sd: Ensure we correctly disable devices with unknown protection type

We set the capacity to zero when we discovered a device formatted with
an unknown DIF protection type. However, the read_capacity code would
override the capacity and cause the device to be enabled regardless.

Make sd_read_protection_type() return an error if the protection type is
unknown. Also prevent duplicate printk lines when the device is being
revalidated.

Reported-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index 5f7d5b3b1c6e..49084807eb6b 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -873,6 +873,9 @@ static inline unsigned int scsi_host_dif_capable(struct Scsi_Host *shost, unsign
                                        SHOST_DIF_TYPE2_PROTECTION,
                                        SHOST_DIF_TYPE3_PROTECTION };
 
+        if (target_type > SHOST_DIF_TYPE3_PROTECTION)
+                return 0;
+
         return shost->prot_capabilities & cap[target_type] ? target_type : 0;
 }
 
@@ -884,6 +887,9 @@ static inline unsigned int scsi_host_dix_capable(struct Scsi_Host *shost, unsign
                                        SHOST_DIX_TYPE2_PROTECTION,
                                        SHOST_DIX_TYPE3_PROTECTION };
 
+        if (target_type > SHOST_DIX_TYPE3_PROTECTION)
+                return 0;
+
         return shost->prot_capabilities & cap[target_type];
 #endif
         return 0;