[git:media_stage/master] media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity

[Hans Verkuil]

This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity
Author:  Zhipeng Lu <alexi...@zju.edu.cn>
Date:    Thu Feb 1 20:48:44 2024 +0800

The entity->name (i.e. name) is allocated in v4l2_m2m_register_entity
but isn't freed in its following error-handling paths. This patch
adds such deallocation to prevent memleak of entity->name.

Fixes: be2fff656322 ("media: add helpers for memory-to-memory media controller")
Signed-off-by: Zhipeng Lu <alexi...@zju.edu.cn>
Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>

 drivers/media/v4l2-core/v4l2-mem2mem.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

---

diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c 
b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 9e983176542b..75517134a5e9 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -1087,11 +1087,17 @@ static int v4l2_m2m_register_entity(struct media_device 
*mdev,
        entity->function = function;
 
        ret = media_entity_pads_init(entity, num_pads, pads);
-       if (ret)
+       if (ret) {
+               kfree(entity->name);
+               entity->name = NULL;
                return ret;
+       }
        ret = media_device_register_entity(mdev, entity);
-       if (ret)
+       if (ret) {
+               kfree(entity->name);
+               entity->name = NULL;
                return ret;
+       }
 
        return 0;
 }