proc: bootconfig: add null pointer check

[PATCH] proc: bootconfig: add null pointer check

Posted by cgel.zte@gmail.com 4 years, 2 months ago

From: Lv Ruyi <lv.ruyi@zte.com.cn>

kzalloc is a memory allocation function which can return NULL when some
internal memory errors happen. It is safer to add null pointer check.

Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
---
 fs/proc/bootconfig.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/proc/bootconfig.c b/fs/proc/bootconfig.c
index 6d8d4bf20837..2e244ada1f97 100644
--- a/fs/proc/bootconfig.c
+++ b/fs/proc/bootconfig.c
@@ -32,6 +32,8 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
 	int ret = 0;
 
 	key = kzalloc(XBC_KEYLEN_MAX, GFP_KERNEL);
+	if (!key)
+		return -ENOMEM;
 
 	xbc_for_each_key_value(leaf, val) {
 		ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX);
-- 
2.25.1

Re: [PATCH] proc: bootconfig: add null pointer check

Posted by Masami Hiramatsu 4 years, 2 months ago

On Tue, 29 Mar 2022 10:40:04 +0000
cgel.zte@gmail.com wrote:

> From: Lv Ruyi <lv.ruyi@zte.com.cn>
> 
> kzalloc is a memory allocation function which can return NULL when some
> internal memory errors happen. It is safer to add null pointer check.

Oops, yes.

Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thank you!

> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
> ---
>  fs/proc/bootconfig.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/fs/proc/bootconfig.c b/fs/proc/bootconfig.c
> index 6d8d4bf20837..2e244ada1f97 100644
> --- a/fs/proc/bootconfig.c
> +++ b/fs/proc/bootconfig.c
> @@ -32,6 +32,8 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
>  	int ret = 0;
>  
>  	key = kzalloc(XBC_KEYLEN_MAX, GFP_KERNEL);
> +	if (!key)
> +		return -ENOMEM;
>  
>  	xbc_for_each_key_value(leaf, val) {
>  		ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX);
> -- 
> 2.25.1
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

Re: [PATCH] proc: bootconfig: add null pointer check

Posted by Masami Hiramatsu 4 years, 2 months ago

Hi Steve,

Can you pick this with below lines? This seems to be there from v5.6.

Fixes: c1a3c36017d4 ("proc: bootconfig: Add /proc/bootconfig to show boot config list")
Cc: stable@vger.kernel.org
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>

Thank you,

On Tue, 29 Mar 2022 10:40:04 +0000
cgel.zte@gmail.com wrote:

> From: Lv Ruyi <lv.ruyi@zte.com.cn>
> 
> kzalloc is a memory allocation function which can return NULL when some
> internal memory errors happen. It is safer to add null pointer check.
> 
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
> ---
>  fs/proc/bootconfig.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/fs/proc/bootconfig.c b/fs/proc/bootconfig.c
> index 6d8d4bf20837..2e244ada1f97 100644
> --- a/fs/proc/bootconfig.c
> +++ b/fs/proc/bootconfig.c
> @@ -32,6 +32,8 @@ static int __init copy_xbc_key_value_list(char *dst, size_t size)
>  	int ret = 0;
>  
>  	key = kzalloc(XBC_KEYLEN_MAX, GFP_KERNEL);
> +	if (!key)
> +		return -ENOMEM;
>  
>  	xbc_for_each_key_value(leaf, val) {
>  		ret = xbc_node_compose_key(leaf, key, XBC_KEYLEN_MAX);
> -- 
> 2.25.1
> 


-- 
Masami Hiramatsu <mhiramat@kernel.org>

Re: [PATCH] proc: bootconfig: add null pointer check

Posted by Steven Rostedt 4 years, 2 months ago

On Tue, 29 Mar 2022 23:30:53 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:

> Hi Steve,
> 
> Can you pick this with below lines? This seems to be there from v5.6.
> 
> Fixes: c1a3c36017d4 ("proc: bootconfig: Add /proc/bootconfig to show boot config list")
> Cc: stable@vger.kernel.org
> Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
> 
> 

Sure.

-- Steve