scsi: hpsa: use strscpy to instead of strncpy()
Subsystems (2)
PATCH 1/1 scsi: hpsa: use strscpy to instead of strncpy()
From: Xu Panda <[email protected]>
The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.
Signed-off-by Xu Panda <[email protected]>
Signed-off-by Yang Yang <[email protected]>
--- drivers/scsi/hpsa.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/scsi/hpsa.c +5 -10
@@ -452,16 +452,14 @@ static ssize_t host_store_hp_ssd_smart_path_status(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { - int status, len; + int status;struct ctlr_info *h;struct Scsi_Host *shost =class_to_shost (dev);char tmpbuf[10 ];if (!capable (CAP_SYS_ADMIN ) || !capable (CAP_SYS_RAWIO ))return -EACCES ; - len = count >sizeof (tmpbuf) -1 ?sizeof (tmpbuf) -1 : count; -strncpy (tmpbuf, buf, len); - tmpbuf[len] ='\0' ; +strscpy (tmpbuf, buf,sizeof (tmpbuf));if (sscanf (tmpbuf,"%d" , &status) !=1 )return -EINVAL ; h =shost_to_hba (shost);
@@ -476,16 +474,14 @@ static ssize_t host_store_raid_offload_debug(struct device *dev,struct device_attribute *attr, const char *buf, size_t count) { - int debug_level, len; + int debug_level;struct ctlr_info *h;struct Scsi_Host *shost =class_to_shost (dev);char tmpbuf[10 ];if (!capable (CAP_SYS_ADMIN ) || !capable (CAP_SYS_RAWIO ))return -EACCES ; - len = count >sizeof (tmpbuf) -1 ?sizeof (tmpbuf) -1 : count; -strncpy (tmpbuf, buf, len); - tmpbuf[len] ='\0' ; +strscpy (tmpbuf, buf,sizeof (tmpbuf));if (sscanf (tmpbuf,"%d" , &debug_level) !=1 )return -EINVAL ;if (debug_level <0 )
@@ -7236,8 +7232,7 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev,static void init_driver_version (char *driver_version,int len) { -memset (driver_version,0 , len); -strncpy (driver_version,HPSA " " HPSA_DRIVER_VERSION , len -1 ); +strscpy (driver_version,HPSA " " HPSA_DRIVER_VERSION , len); }static int write_driver_ver_to_cfgtable (struct CfgTable __iomem *cfgtable)
Signature · 1 line
2.15.2