public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] kernel/params.c: use scnprintf() instead of sprintf()
@ 2013-08-20  3:17 Chen Gang
  2013-08-20  6:05 ` Rusty Russell
  0 siblings, 1 reply; 3+ messages in thread
From: Chen Gang @ 2013-08-20  3:17 UTC (permalink / raw)
  To: jg1.han, Rusty Russell, khali, David.Woodhouse
  Cc: Andrew Morton, linux-kernel@vger.kernel.org

For some strings (e.g. version string), they are permitted to be larger
than PAGE_SIZE (although meaningless), so recommend to use scnprintf()
instead of sprintf().


Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
 kernel/params.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/params.c b/kernel/params.c
index 1f228a3..4da300f 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -241,7 +241,8 @@ int parse_args(const char *doing,
 	}								\
 	int param_get_##name(char *buffer, const struct kernel_param *kp) \
 	{								\
-		return sprintf(buffer, format, *((type *)kp->arg));	\
+		return scnprintf(buffer, PAGE_SIZE, format,		\
+				*((type *)kp->arg));			\
 	}								\
 	struct kernel_param_ops param_ops_##name = {			\
 		.set = param_set_##name,				\
@@ -285,7 +286,7 @@ EXPORT_SYMBOL(param_set_charp);
 
 int param_get_charp(char *buffer, const struct kernel_param *kp)
 {
-	return sprintf(buffer, "%s", *((char **)kp->arg));
+	return scnprintf(buffer, PAGE_SIZE, "%s", *((char **)kp->arg));
 }
 EXPORT_SYMBOL(param_get_charp);
 
@@ -827,7 +828,7 @@ ssize_t __modver_version_show(struct module_attribute *mattr,
 	struct module_version_attribute *vattr =
 		container_of(mattr, struct module_version_attribute, mattr);
 
-	return sprintf(buf, "%s\n", vattr->version);
+	return scnprintf(buf, PAGE_SIZE, "%s\n", vattr->version);
 }
 
 extern const struct module_version_attribute *__start___modver[];
-- 
1.7.7.6

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] kernel/params.c: use scnprintf() instead of sprintf()
  2013-08-20  3:17 [PATCH] kernel/params.c: use scnprintf() instead of sprintf() Chen Gang
@ 2013-08-20  6:05 ` Rusty Russell
  2013-08-21  2:04   ` Chen Gang
  0 siblings, 1 reply; 3+ messages in thread
From: Rusty Russell @ 2013-08-20  6:05 UTC (permalink / raw)
  To: Chen Gang, jg1.han, khali, David.Woodhouse
  Cc: Andrew Morton, linux-kernel@vger.kernel.org

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

> For some strings (e.g. version string), they are permitted to be larger
> than PAGE_SIZE (although meaningless), so recommend to use scnprintf()
> instead of sprintf().

Applied.

Thanks,
Rusty.

>
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> ---
>  kernel/params.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/params.c b/kernel/params.c
> index 1f228a3..4da300f 100644
> --- a/kernel/params.c
> +++ b/kernel/params.c
> @@ -241,7 +241,8 @@ int parse_args(const char *doing,
>  	}								\
>  	int param_get_##name(char *buffer, const struct kernel_param *kp) \
>  	{								\
> -		return sprintf(buffer, format, *((type *)kp->arg));	\
> +		return scnprintf(buffer, PAGE_SIZE, format,		\
> +				*((type *)kp->arg));			\
>  	}								\
>  	struct kernel_param_ops param_ops_##name = {			\
>  		.set = param_set_##name,				\
> @@ -285,7 +286,7 @@ EXPORT_SYMBOL(param_set_charp);
>  
>  int param_get_charp(char *buffer, const struct kernel_param *kp)
>  {
> -	return sprintf(buffer, "%s", *((char **)kp->arg));
> +	return scnprintf(buffer, PAGE_SIZE, "%s", *((char **)kp->arg));
>  }
>  EXPORT_SYMBOL(param_get_charp);
>  
> @@ -827,7 +828,7 @@ ssize_t __modver_version_show(struct module_attribute *mattr,
>  	struct module_version_attribute *vattr =
>  		container_of(mattr, struct module_version_attribute, mattr);
>  
> -	return sprintf(buf, "%s\n", vattr->version);
> +	return scnprintf(buf, PAGE_SIZE, "%s\n", vattr->version);
>  }
>  
>  extern const struct module_version_attribute *__start___modver[];
> -- 
> 1.7.7.6

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] kernel/params.c: use scnprintf() instead of sprintf()
  2013-08-20  6:05 ` Rusty Russell
@ 2013-08-21  2:04   ` Chen Gang
  0 siblings, 0 replies; 3+ messages in thread
From: Chen Gang @ 2013-08-21  2:04 UTC (permalink / raw)
  To: Rusty Russell
  Cc: jg1.han, khali, David.Woodhouse, Andrew Morton,
	linux-kernel@vger.kernel.org

On 08/20/2013 02:05 PM, Rusty Russell wrote:
> Chen Gang <gang.chen@asianux.com> writes:
> 
>> For some strings (e.g. version string), they are permitted to be larger
>> than PAGE_SIZE (although meaningless), so recommend to use scnprintf()
>> instead of sprintf().
> 
> Applied.
> 

Thanks.

> Thanks,
> Rusty.
> 
>>
>> Signed-off-by: Chen Gang <gang.chen@asianux.com>
>> ---
>>  kernel/params.c |    7 ++++---
>>  1 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/kernel/params.c b/kernel/params.c
>> index 1f228a3..4da300f 100644
>> --- a/kernel/params.c
>> +++ b/kernel/params.c
>> @@ -241,7 +241,8 @@ int parse_args(const char *doing,
>>  	}								\
>>  	int param_get_##name(char *buffer, const struct kernel_param *kp) \
>>  	{								\
>> -		return sprintf(buffer, format, *((type *)kp->arg));	\
>> +		return scnprintf(buffer, PAGE_SIZE, format,		\
>> +				*((type *)kp->arg));			\
>>  	}								\
>>  	struct kernel_param_ops param_ops_##name = {			\
>>  		.set = param_set_##name,				\
>> @@ -285,7 +286,7 @@ EXPORT_SYMBOL(param_set_charp);
>>  
>>  int param_get_charp(char *buffer, const struct kernel_param *kp)
>>  {
>> -	return sprintf(buffer, "%s", *((char **)kp->arg));
>> +	return scnprintf(buffer, PAGE_SIZE, "%s", *((char **)kp->arg));
>>  }
>>  EXPORT_SYMBOL(param_get_charp);
>>  
>> @@ -827,7 +828,7 @@ ssize_t __modver_version_show(struct module_attribute *mattr,
>>  	struct module_version_attribute *vattr =
>>  		container_of(mattr, struct module_version_attribute, mattr);
>>  
>> -	return sprintf(buf, "%s\n", vattr->version);
>> +	return scnprintf(buf, PAGE_SIZE, "%s\n", vattr->version);
>>  }
>>  
>>  extern const struct module_version_attribute *__start___modver[];
>> -- 
>> 1.7.7.6
> 
> 


-- 
Chen Gang

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-08-21  2:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-20  3:17 [PATCH] kernel/params.c: use scnprintf() instead of sprintf() Chen Gang
2013-08-20  6:05 ` Rusty Russell
2013-08-21  2:04   ` Chen Gang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox