2022-12-19 04:14:26

by Li zeming

[permalink] [raw]
Subject: [PATCH] v4l2-core: v4l2-h264: check after increasing memory allocation

The pointer *out_str adds judgment and should help with program robustness.

Signed-off-by: Li zeming <[email protected]>
---
drivers/media/v4l2-core/v4l2-h264.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c
index 72bd64f65198..934aba539332 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)
+ return NULL;

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

--
2.18.2


2022-12-19 07:57:20

by Bagas Sanjaya

[permalink] [raw]
Subject: Re: [PATCH] v4l2-core: v4l2-h264: check after increasing memory allocation

On Mon, Dec 19, 2022 at 11:37:12AM +0800, Li zeming wrote:
> The pointer *out_str adds judgment and should help with program robustness.
>

Terminology: if[-else] blocks are conditionals, not judgements.

> diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c
> index 72bd64f65198..934aba539332 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)
> + return NULL;

Why did you add the check beside robustness?

Thanks.

--
An old man doll... just what I always wanted! - Clara


Attachments:
(No filename) (775.00 B)
signature.asc (235.00 B)
Download all attachments