[SCSI] qla2xxx: Fix undefined behavior in call to snprintf().

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 3464782ab5a4cd1a821594c3a09855a1e12f82bd..2a14df86f63992c74b2997b759ac656855d0bd5b 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -917,8 +917,8 @@ qla2x00_serial_num_show(struct device *dev, struct device_attribute *attr,
                return snprintf(buf, PAGE_SIZE, "%s\n",
                    vha->hw->mr.serial_num);
        } else if (IS_FWI2_CAPABLE(ha)) {
-               qla2xxx_get_vpd_field(vha, "SN", buf, PAGE_SIZE);
-               return snprintf(buf, PAGE_SIZE, "%s\n", buf);
+               qla2xxx_get_vpd_field(vha, "SN", buf, PAGE_SIZE - 1);
+               return strlen(strcat(buf, "\n"));
        }
 
        sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;