On Sat Nov 1 12:08:00 2025 +0300, Dmitry Antipov wrote:
> Avoid 'strlen()'/'kmalloc()'/'snprintf()' sequence by using
> the convenient 'kasprintf()' in 'v4l2_m2m_register_entity()'.
>
> Signed-off-by: Dmitry Antipov <[email protected]>
> Signed-off-by: Hans Verkuil <[email protected]>
Patch committed.
Thanks,
Hans Verkuil
drivers/media/v4l2-core/v4l2-mem2mem.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c
b/drivers/media/v4l2-core/v4l2-mem2mem.c
index ae0de54d4c3e..b661f483dad3 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -1037,8 +1037,6 @@ static int v4l2_m2m_register_entity(struct media_device
*mdev,
{
struct media_entity *entity;
struct media_pad *pads;
- char *name;
- unsigned int len;
int num_pads;
int ret;
@@ -1071,12 +1069,10 @@ static int v4l2_m2m_register_entity(struct media_device
*mdev,
entity->info.dev.major = VIDEO_MAJOR;
entity->info.dev.minor = vdev->minor;
}
- len = strlen(vdev->name) + 2 + strlen(m2m_entity_name[type]);
- name = kmalloc(len, GFP_KERNEL);
- if (!name)
+ entity->name = kasprintf(GFP_KERNEL, "%s-%s", vdev->name,
+ m2m_entity_name[type]);
+ if (!entity->name)
return -ENOMEM;
- snprintf(name, len, "%s-%s", vdev->name, m2m_entity_name[type]);
- entity->name = name;
entity->function = function;
ret = media_entity_pads_init(entity, num_pads, pads);
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
