media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity

[ Upstream commit 8f94b49a5b5d386c038e355bef6347298aabd211 ]

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 <alexious@zju.edu.cn>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index ad14d521410675fb7889883c11b7fd61afc26f6a..56d320b1a1ca77e257ef1ae334158f0ce6dcec2e 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -1053,11 +1053,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;
 }