target: don't truncate the fail intr address
Subsystems (3)
PATCH 2/2 target: don't truncate the fail intr address
The temporary buffer was only 32 characters but ->last_intr_fail_ip_addr is a 48 character buffer. We don't need to use a temporary buffer at all, we can just print directly to "page".
Signed-off-by Dan Carpenter <[email protected]>
---
Compile tested only.
drivers/target/iscsi/iscsi_target_stat.c +9 -6
@@ -429,16 +429,19 @@ static ssize_t iscsi_stat_tgt_attr_show_attr_fail_intr_addr(struct iscsi_tiqn *tiqn =container_of (igrps, struct iscsi_tiqn, tiqn_stat_grps);struct iscsi_login_stats *lstat = &tiqn->login_stats; -unsigned char buf[32 ]; +int ret;spin_lock (&lstat->lock); -if (lstat->last_intr_fail_ip_family =AF_INET6 ) -snprintf (buf,32 ,"[%s]" , lstat->last_intr_fail_ip_addr); -else -snprintf (buf,32 ,"%s" , lstat->last_intr_fail_ip_addr); +if (lstat->last_intr_fail_ip_family =AF_INET6 ) { + ret =snprintf (page,PAGE_SIZE ,"[%s]\n" , + lstat->last_intr_fail_ip_addr); + }else { + ret =snprintf (page,PAGE_SIZE ,"%s\n" , + lstat->last_intr_fail_ip_addr); + }spin_unlock (&lstat->lock); -return snprintf (page,PAGE_SIZE ,"%s\n" , buf); +return ret; }ISCSI_STAT_TGT_ATTR_RO (fail_intr_addr);
Quoted 6 lines · Dan Carpenter
The temporary buffer was only 32 characters but ->last_intr_fail_ip_addr is a 48 character buffer. We don't need to use a temporary buffer at all, we can just print directly to "page".
Signed-off-by Dan Carpenter <[email protected]>---
Also applied to for-next.
Thanks Dan!
--nab
Quoted 36 lines
Compile tested only.
drivers/target/iscsi/iscsi_target_stat.c +9
-7@@ -429,16 +429,19 @@ static ssize_t iscsi_stat_tgt_attr_show_attr_fail_intr_addr(struct iscsi_tiqn *tiqn =container_of (igrps, struct iscsi_tiqn, tiqn_stat_grps);struct iscsi_login_stats *lstat = &tiqn->login_stats; -unsigned char buf[32 ]; +int ret;spin_lock (&lstat->lock); -if (lstat->last_intr_fail_ip_family =AF_INET6 ) -snprintf (buf,32 ,"[%s]" , lstat->last_intr_fail_ip_addr); -else -snprintf (buf,32 ,"%s" , lstat->last_intr_fail_ip_addr); +if (lstat->last_intr_fail_ip_family =AF_INET6 ) { + ret =snprintf (page,PAGE_SIZE ,"[%s]\n" , + lstat->last_intr_fail_ip_addr); + }else { + ret =snprintf (page,PAGE_SIZE ,"%s\n" , + lstat->last_intr_fail_ip_addr); + }spin_unlock (&lstat->lock); -return snprintf (page,PAGE_SIZE ,"%s\n" , buf); +return ret; }ISCSI_STAT_TGT_ATTR_RO (fail_intr_addr); --To unsubscribe from this list: send the line "unsubscribe target-devel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html