From: Dong Chuanjian chuanjian@nfschina.com
[ Upstream commit be3ae7cf4326e95bb1d5413b63baabc26f4a1324 ]
When the pointer variable is judged to be null, null is returned directly.
[hverkuil: fix two checkpatch warnings]
Signed-off-by: Dong Chuanjian chuanjian@nfschina.com Acked-by: Nicolas Dufresne nicolas.dufresne@collabora.com Fixes: d3f756ad629b ("media: v4l2: Trace calculated p/b0/b1 initial reflist") Signed-off-by: Hans Verkuil hverkuil-cisco@xs4all.nl Signed-off-by: Mauro Carvalho Chehab mchehab@kernel.org Signed-off-by: Sasha Levin sashal@kernel.org --- drivers/media/v4l2-core/v4l2-h264.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-h264.c b/drivers/media/v4l2-core/v4l2-h264.c index 72bd64f651981..c00197d095e75 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, "|");
@@ -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)) + return NULL;
n += snprintf(*out_str + n, tmp_str_size - n, "|");