Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af37aed0 authored by Zhipeng Lu's avatar Zhipeng Lu Committed by Sasha Levin
Browse files

media: ttpci: fix two memleaks in budget_av_attach 



[ Upstream commit d0b07f712bf61e1a3cf23c87c663791c42e50837 ]

When saa7146_register_device and saa7146_vv_init fails, budget_av_attach
should free the resources it allocates, like the error-handling of
ttpci_budget_init does. Besides, there are two fixme comment refers to
such deallocations.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarZhipeng Lu <alexious@zju.edu.cn>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 353f980a

drivers/media/pci/ttpci/budget-av.c

+5 −3
Original line number Diff line number Diff line
@@ -1462,7 +1462,8 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 
		budget_av->has_saa7113 = 1;

		err = saa7146_vv_init(dev, &vv_data);

		if (err != 0) {

			/* fixme: proper cleanup here */

			ttpci_budget_deinit(&budget_av->budget);

			kfree(budget_av);

			ERR("cannot init vv subsystem\n");

			return err;

		}
@@ -1471,9 +1472,10 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 
		vv_data.vid_ops.vidioc_s_input = vidioc_s_input;



		if ((err = saa7146_register_device(&budget_av->vd, dev, "knc1", VFL_TYPE_VIDEO))) {

			/* fixme: proper cleanup here */

			ERR("cannot register capture v4l2 device\n");

			saa7146_vv_release(dev);

			ttpci_budget_deinit(&budget_av->budget);

			kfree(budget_av);

			ERR("cannot register capture v4l2 device\n");

			return err;

		}