Skip to content

Commit

Permalink
media: v4l2-mem2mem: fix a memleak in v4l2_m2m_register_entity
Browse files Browse the repository at this point in the history
[ 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: be2fff6 ("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>
  • Loading branch information
AlexiousLu authored and Sasha Levin committed Mar 26, 2024
1 parent 622b1cf commit 9c23ef3
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/media/v4l2-core/v4l2-mem2mem.c
Expand Up @@ -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;
}
Expand Down

0 comments on commit 9c23ef3

Please sign in to comment.