aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Carnuccio <joe.carnuccio@qlogic.com>2013-10-30 03:38:19 -0400
committerJames Bottomley <JBottomley@Parallels.com>2013-12-19 10:38:59 -0500
commitad5fa025d8fdc850f4ebf34d523a99739aae3e33 (patch)
tree69fb0f5cbcba052bf6308eab71a8333de19b298e
parentdb64e9301c067245928bfdbbd9c048cdba087927 (diff)
[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>
-rw-r--r--drivers/scsi/qla2xxx/qla_attr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index 3464782ab5a4..2a14df86f639 100644
--- 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,
917 return snprintf(buf, PAGE_SIZE, "%s\n", 917 return snprintf(buf, PAGE_SIZE, "%s\n",
918 vha->hw->mr.serial_num); 918 vha->hw->mr.serial_num);
919 } else if (IS_FWI2_CAPABLE(ha)) { 919 } else if (IS_FWI2_CAPABLE(ha)) {
920 qla2xxx_get_vpd_field(vha, "SN", buf, PAGE_SIZE); 920 qla2xxx_get_vpd_field(vha, "SN", buf, PAGE_SIZE - 1);
921 return snprintf(buf, PAGE_SIZE, "%s\n", buf); 921 return strlen(strcat(buf, "\n"));
922 } 922 }
923 923
924 sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1; 924 sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | ha->serial1;