diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2011-10-08 06:45:07 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-20 11:07:42 -0400 |
commit | dc55b8274daddffefc34026ed7924138c8c5df17 (patch) | |
tree | 9f87676a30da007e0546f7f689d0dcd047eb1715 /drivers/scsi/aacraid | |
parent | d15fdd348313c64438a99d1324ba2eccdcf1e7e6 (diff) |
[SCSI] aacraid: use lower snprintf() limit
This is just a cleanup, to silence static checker warnings. It
doesn't change how the code works.
buf[] can either be BUF_SIZE if this is called from sysfs, or it can
be 16 if it's called from aac_get_adapter_info() via
aac_get_serial_number(). We use the smaller limit here.
sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo) is 12 so there
is actually no chance of hitting either limit.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Achim Leubner <Achim_Leubner@pmc-sierra.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/aacraid')
-rw-r--r-- | drivers/scsi/aacraid/linit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 3382475dc22d..4aa76d6f11df 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -894,16 +894,17 @@ static ssize_t aac_show_serial_number(struct device *device, | |||
894 | int len = 0; | 894 | int len = 0; |
895 | 895 | ||
896 | if (le32_to_cpu(dev->adapter_info.serial[0]) != 0xBAD0) | 896 | if (le32_to_cpu(dev->adapter_info.serial[0]) != 0xBAD0) |
897 | len = snprintf(buf, PAGE_SIZE, "%06X\n", | 897 | len = snprintf(buf, 16, "%06X\n", |
898 | le32_to_cpu(dev->adapter_info.serial[0])); | 898 | le32_to_cpu(dev->adapter_info.serial[0])); |
899 | if (len && | 899 | if (len && |
900 | !memcmp(&dev->supplement_adapter_info.MfgPcbaSerialNo[ | 900 | !memcmp(&dev->supplement_adapter_info.MfgPcbaSerialNo[ |
901 | sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo)-len], | 901 | sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo)-len], |
902 | buf, len-1)) | 902 | buf, len-1)) |
903 | len = snprintf(buf, PAGE_SIZE, "%.*s\n", | 903 | len = snprintf(buf, 16, "%.*s\n", |
904 | (int)sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo), | 904 | (int)sizeof(dev->supplement_adapter_info.MfgPcbaSerialNo), |
905 | dev->supplement_adapter_info.MfgPcbaSerialNo); | 905 | dev->supplement_adapter_info.MfgPcbaSerialNo); |
906 | return len; | 906 | |
907 | return min(len, 16); | ||
907 | } | 908 | } |
908 | 909 | ||
909 | static ssize_t aac_show_max_channel(struct device *device, | 910 | static ssize_t aac_show_max_channel(struct device *device, |