From: Alan Adamson Date: Fri, 8 Mar 2019 17:52:01 +0000 (-0800) Subject: scsi: target: remove hardcoded T10 Vendor ID in INQUIRY response X-Git-Tag: v4.1.12-124.31.3~203 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ae4d97d27141110eb3c54f16c0c15c9c07e3e5c3;p=users%2Fjedix%2Flinux-maple.git scsi: target: remove hardcoded T10 Vendor ID in INQUIRY response Use the value stored in t10_wwn.vendor, which defaults to "LIO-ORG", but can be reconfigured via the vendor_id ConfigFS attribute. This commit was backported by hand. Orabug: 29344862 Signed-off-by: Alan Adamson Reviewed-by: Bijan Mottahedeh Signed-off-by: Brian Maly --- diff --git a/drivers/target/target_core_spc.c b/drivers/target/target_core_spc.c index 313145294dfd..c51a192d02d8 100644 --- a/drivers/target/target_core_spc.c +++ b/drivers/target/target_core_spc.c @@ -122,7 +122,8 @@ spc_emulate_inquiry_std(struct se_cmd *cmd, unsigned char *buf) */ memset(&buf[8], 0x20, INQUIRY_VENDOR_LEN + INQUIRY_MODEL_LEN + INQUIRY_REVISION_LEN); - memcpy(&buf[8], "LIO-ORG", sizeof("LIO-ORG") - 1); + memcpy(&buf[8], dev->t10_wwn.vendor, + strnlen(dev->t10_wwn.vendor, INQUIRY_VENDOR_LEN)); memcpy(&buf[16], dev->t10_wwn.model, strnlen(dev->t10_wwn.model, INQUIRY_MODEL_LEN)); memcpy(&buf[32], dev->t10_wwn.revision, @@ -275,8 +276,9 @@ check_t10_vend_desc: buf[off+1] = 0x1; /* T10 Vendor ID */ buf[off+2] = 0x0; /* left align Vendor ID and pad with spaces */ - memset(&buf[off+4], 0x20, 8); - memcpy(&buf[off+4], "LIO-ORG", sizeof("LIO-ORG") - 1); + memset(&buf[off+4], 0x20, INQUIRY_VENDOR_LEN); + memcpy(&buf[off+4], dev->t10_wwn.vendor, + strnlen(dev->t10_wwn.vendor, INQUIRY_VENDOR_LEN)); /* Extra Byte for NULL Terminator */ id_len++; /* Identifier Length */