[PATCH] ARM:mach-msm: seting tail NUL after strncpy

[PATCH] ARM:mach-msm: seting tail NUL after strncpy

[Chen Gang]

  temp need NUL terminated, or next ptr may cause issue.

Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
 arch/arm/mach-msm/clock-debug.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/mach-msm/clock-debug.c
b/arch/arm/mach-msm/clock-debug.c
index 4886404..bdca900 100644
--- a/arch/arm/mach-msm/clock-debug.c
+++ b/arch/arm/mach-msm/clock-debug.c
@@ -105,6 +105,8 @@ int __init clock_debug_add(struct clk *clock)
 		return -ENOMEM;

 	strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
+	temp[ARRAY_SIZE(temp)-1] = '\0';
+
 	for (ptr = temp; *ptr; ptr++)
 		*ptr = tolower(*ptr);

-- 
1.7.10.4

[PATCH] ARM:mach-msm: seting tail NUL after strncpy

[Bjørn Mork]

Chen Gang <gang.chen@asianux.com> writes:

>   temp need NUL terminated, or next ptr may cause issue.
>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
>  arch/arm/mach-msm/clock-debug.c |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-msm/clock-debug.c
> b/arch/arm/mach-msm/clock-debug.c
> index 4886404..bdca900 100644
> --- a/arch/arm/mach-msm/clock-debug.c
> +++ b/arch/arm/mach-msm/clock-debug.c
> @@ -105,6 +105,8 @@ int __init clock_debug_add(struct clk *clock)
>  		return -ENOMEM;
>
>  	strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
> +	temp[ARRAY_SIZE(temp)-1] = '\0';
> +
>  	for (ptr = temp; *ptr; ptr++)
>  		*ptr = tolower(*ptr);

Maybe use strlcpy() instead?


Bj?rn

[PATCH] ARM:mach-msm: seting tail NUL after strncpy

[Chen Gang]

? 2013?01?30? 17:19, Bj?rn Mork ??:
> Maybe use strlcpy() instead?

  ok, I will send patch v2.

  it will be "strlcpy(temp, clock->dbg_name, ARRAY_SIZE(temp));"


  thanks.

-- 
Chen Gang

Asianux Corporation

[PATCH v2] ARM:mach-msm: using strlcpy instead lof strncpy

[Chen Gang]

  The fields must be null-terminated, or next ptr, will cause issue

Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
 arch/arm/mach-msm/clock-debug.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-msm/clock-debug.c b/arch/arm/mach-msm/clock-debug.c
index 4886404..c40dcaf 100644
--- a/arch/arm/mach-msm/clock-debug.c
+++ b/arch/arm/mach-msm/clock-debug.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/ctype.h>
 #include <linux/debugfs.h>
+#include <linux/string.h>
 #include <linux/clk.h>
 #include "clock.h"
 
@@ -104,7 +105,7 @@ int __init clock_debug_add(struct clk *clock)
 	if (!debugfs_base)
 		return -ENOMEM;
 
-	strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
+	strlcpy(temp, clock->dbg_name, ARRAY_SIZE(temp));
 	for (ptr = temp; *ptr; ptr++)
 		*ptr = tolower(*ptr);
 
-- 
1.7.10.4

[PATCH] ARM:mach-msm: seting tail NUL after strncpy

[David Brown]

Chen Gang <gang.chen@asianux.com> writes:

>   temp need NUL terminated, or next ptr may cause issue.
>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
>  arch/arm/mach-msm/clock-debug.c |    2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-msm/clock-debug.c
> b/arch/arm/mach-msm/clock-debug.c
> index 4886404..bdca900 100644
> --- a/arch/arm/mach-msm/clock-debug.c
> +++ b/arch/arm/mach-msm/clock-debug.c
> @@ -105,6 +105,8 @@ int __init clock_debug_add(struct clk *clock)
>  		return -ENOMEM;
>
>  	strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
> +	temp[ARRAY_SIZE(temp)-1] = '\0';
> +
>  	for (ptr = temp; *ptr; ptr++)

I believe that Stephen Boyd is putting some significant work into this
code.  Stephen, can you see if this bug is still in your current
version of the code, and make sure that it is fixed there?

Thanks,
David

-- 
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

[PATCH] ARM:mach-msm: seting tail NUL after strncpy

[Stephen Boyd]

On 01/30/13 13:33, David Brown wrote:
> Chen Gang <gang.chen@asianux.com> writes:
>
>>   temp need NUL terminated, or next ptr may cause issue.
>>
>> Signed-off-by: Chen Gang <gang.chen@asianux.com>
>> ---
>>  arch/arm/mach-msm/clock-debug.c |    2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/arm/mach-msm/clock-debug.c
>> b/arch/arm/mach-msm/clock-debug.c
>> index 4886404..bdca900 100644
>> --- a/arch/arm/mach-msm/clock-debug.c
>> +++ b/arch/arm/mach-msm/clock-debug.c
>> @@ -105,6 +105,8 @@ int __init clock_debug_add(struct clk *clock)
>>  		return -ENOMEM;
>>
>>  	strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
>> +	temp[ARRAY_SIZE(temp)-1] = '\0';
>> +
>>  	for (ptr = temp; *ptr; ptr++)
> I believe that Stephen Boyd is putting some significant work into this
> code.  Stephen, can you see if this bug is still in your current
> version of the code, and make sure that it is fixed there?
>

This entire file is deleted in my set of patches that moves the current
MSM clock code to the common clock framework.

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

[PATCH] ARM:mach-msm: seting tail NUL after strncpy

[Chen Gang]

? 2013?01?31? 05:59, Stephen Boyd ??:
> On 01/30/13 13:33, David Brown wrote:
>> I believe that Stephen Boyd is putting some significant work into this
>> code.  Stephen, can you see if this bug is still in your current
>> version of the code, and make sure that it is fixed there?
>>
> 
> This entire file is deleted in my set of patches that moves the current
> MSM clock code to the common clock framework.
> 

  ok, thank you.

  :-)

-- 
Chen Gang

Asianux Corporation