2022-12-27 03:02:41

by Dong Chuanjian

Subject: [PATCH] drivers/media/v4l2-core/v4l2-h264 : add detection of null pointers

When the pointer variable is judged to be null, null is returned
directly.

Signed-off-by: Dong Chuanjian <[email protected]>
---
v2: Directly return when pointer allocation fails.
v3: problems in synchronous repair format_ref_list_p

diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c
index 72bd64f65198..f6684c1d7319 100644
--- a/drivers/media/v4l2-core/v4l2-h264.c
+++ b/drivers/media/v4l2-core/v4l2-h264.c
@@ -305,6 +305,8 @@ static const char *format_ref_list_p(const struct v4l2_h264_reflist_builder *bui
int n = 0, i;

*out_str = kmalloc(tmp_str_size, GFP_KERNEL);
+ if (*out_str == NULL)
+ return NULL;

n += snprintf(*out_str + n, tmp_str_size - n, "|");

@@ -343,6 +345,8 @@ static const char *format_ref_list_b(const struct v4l2_h264_reflist_builder *bui
int n = 0, i;

*out_str = kmalloc(tmp_str_size, GFP_KERNEL);
+ if (*out_str == NULL)
+ return NULL;

n += snprintf(*out_str + n, tmp_str_size - n, "|");

--
2.18.2

2023-01-09 21:43:31

by Nicolas Dufresne

Subject: Re: [PATCH] drivers/media/v4l2-core/v4l2-h264 : add detection of null pointers

Le mardi 27 décembre 2022 à 10:36 +0800, Dong Chuanjian a écrit :
> When the pointer variable is judged to be null, null is returned
> directly.
>
> Signed-off-by: Dong Chuanjian <[email protected]>

Acked-by: Nicolas Dufresne <[email protected]>

Please add the missing Fixes tag.

Fixes: d3f756ad629b39 ("media: v4l2: Trace calculated p/b0/b1 initial reflist")

If someone have time, the pr_debug should be ported to v4l2_debug according to
some other reviews.

> ---
> v2: Directly return when pointer allocation fails.
> v3: problems in synchronous repair format_ref_list_p
>
> diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c
> index 72bd64f65198..f6684c1d7319 100644
> --- a/drivers/media/v4l2-core/v4l2-h264.c
> +++ b/drivers/media/v4l2-core/v4l2-h264.c
> @@ -305,6 +305,8 @@ static const char *format_ref_list_p(const struct v4l2_h264_reflist_builder *bui
> int n = 0, i;
>
> *out_str = kmalloc(tmp_str_size, GFP_KERNEL);
> + if (*out_str == NULL)
> + return NULL;
>
> n += snprintf(*out_str + n, tmp_str_size - n, "|");
>
> @@ -343,6 +345,8 @@ static const char *format_ref_list_b(const struct v4l2_h264_reflist_builder *bui
> int n = 0, i;
>
> *out_str = kmalloc(tmp_str_size, GFP_KERNEL);
> + if (*out_str == NULL)
> + return NULL;
>
> n += snprintf(*out_str + n, tmp_str_size - n, "|");
>