Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1651580 > unrolled thread

[PATCH v2] edac: edac_mc_sysfs.c: Use strlcpy to Copy a C-string into a sized buffer

Back to article view | Back to linux.kernel

Contents

  [PATCH v2] edac: edac_mc_sysfs.c: Use strlcpy to Copy a C-string into a sized buffer Karim Eshapa <karim.eshapa@gmail.com> - 2017-05-26 21:20 +0200
    Re: [PATCH v2] edac: edac_mc_sysfs.c: Use strlcpy to Copy a C-string  into a sized buffer Borislav Petkov <bp@alien8.de> - 2017-05-28 20:20 +0200

#1651580 — [PATCH v2] edac: edac_mc_sysfs.c: Use strlcpy to Copy a C-string into a sized buffer

Use strlcpy with sized buffer instead of strncpy to
avoid non NUL-terminated source strings problems.

Signed-off-by: Karim Eshapa <karim.eshapa@gmail.com>
---
 drivers/edac/edac_mc_sysfs.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
index 445862d..e893b94 100644
--- a/drivers/edac/edac_mc_sysfs.c
+++ b/drivers/edac/edac_mc_sysfs.c
@@ -251,8 +251,7 @@ static ssize_t channel_dimm_label_store(struct device *dev,
 	if (copy_count == 0 || copy_count >= sizeof(rank->dimm->label))
 		return -EINVAL;
 
-	strncpy(rank->dimm->label, data, copy_count);
-	rank->dimm->label[copy_count] = '\0';
+	strlcpy(rank->dimm->label, data, copy_count);
 
 	return count;
 }
@@ -530,8 +529,7 @@ static ssize_t dimmdev_label_store(struct device *dev,
 	if (copy_count == 0 || copy_count >= sizeof(dimm->label))
 		return -EINVAL;
 
-	strncpy(dimm->label, data, copy_count);
-	dimm->label[copy_count] = '\0';
+	strlcpy(dimm->label, data, copy_count);
 
 	return count;
 }
-- 
2.7.4

[toc] | [next] | [standalone]

#1652190 — Re: [PATCH v2] edac: edac_mc_sysfs.c: Use strlcpy to Copy a C-string into a sized buffer

On Fri, May 26, 2017 at 09:10:21PM +0200, Karim Eshapa wrote:
> Use strlcpy with sized buffer instead of strncpy to
> avoid non NUL-terminated source strings problems.

Huh? But it does get terminated.

> Signed-off-by: Karim Eshapa <karim.eshapa@gmail.com>
> ---
>  drivers/edac/edac_mc_sysfs.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
> index 445862d..e893b94 100644
> --- a/drivers/edac/edac_mc_sysfs.c
> +++ b/drivers/edac/edac_mc_sysfs.c
> @@ -251,8 +251,7 @@ static ssize_t channel_dimm_label_store(struct device *dev,
>  	if (copy_count == 0 || copy_count >= sizeof(rank->dimm->label))
>  		return -EINVAL;
>  
> -	strncpy(rank->dimm->label, data, copy_count);
> -	rank->dimm->label[copy_count] = '\0';
> +	strlcpy(rank->dimm->label, data, copy_count);
>  
>  	return count;
>  }
> @@ -530,8 +529,7 @@ static ssize_t dimmdev_label_store(struct device *dev,
>  	if (copy_count == 0 || copy_count >= sizeof(dimm->label))
>  		return -EINVAL;
>  
> -	strncpy(dimm->label, data, copy_count);
> -	dimm->label[copy_count] = '\0';
> +	strlcpy(dimm->label, data, copy_count);

Did you try your patch before sending it?

# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_label
CPU_SrcID#0_Ha#0_Chan#0_DIMM#0
# echo "bla" >  /sys/devices/system/edac/mc/mc0/dimm0/dimm_label
# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_label
bl
# echo "bla boom" >  /sys/devices/system/edac/mc/mc0/dimm0/dimm_label
# cat /sys/devices/system/edac/mc/mc0/dimm0/dimm_label
bla boo

Also, I don't like the fact that strlcpy does not pad the remainder of
the dest buffer with NUL.

So unless you're seeing a real bug, please don't waste your time with
this. There are enough real bugs in the kernel which need fixing.

Thanks.

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web