Groups > linux.kernel > #1420052

[patch] media: s5p-mfc: fix a couple double frees in probe

Path	csiph.com!news.freedyn.net!newsreader4.netcologne.de!news.netcologne.de!news.unit0.net!news.panservice.it!diesel.cu.mi.it!bofh.it!news.nic.it!robomod
From	Dan Carpenter <dan.carpenter@oracle.com>
Newsgroups	linux.kernel
Subject	[patch] media: s5p-mfc: fix a couple double frees in probe
Date	Sat, 11 Jun 2016 22:00:01 +0200
Message-ID	<rIXex-7fY-3@gated-at.bofh.it> (permalink)
MIME-Version	1.0
Content-Type	text/plain; charset=us-ascii
Content-Disposition	inline
User-Agent	Mutt/1.6.0 (2016-04-01)
X-Source-IP	userv0022.oracle.com [156.151.31.74]
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	30
Organization	linux.* mail to news gateway
X-Original-Cc	Kamil Debski <k.debski@samsung.com>, Jeongtae Park <jtp.park@samsung.com>, Mauro Carvalho Chehab <mchehab@osg.samsung.com>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org
X-Original-Date	Sat, 11 Jun 2016 22:56:32 +0300
X-Original-Message-ID	<20160611195632.GA1403@mwanda>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1420052

Show key headers only | View raw

The extra calls to video_device_release() are a bug, we free these after
the goto.

Fixes: c974c436eaf4 ('s5p-mfc: Fix race between s5p_mfc_probe() and s5p_mfc_open()')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This code would be easier to understand if it didn't use "come from"
style label names so that "goto release_dec;" would release dec etc
instead of "goto register_dec;"

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 6ee620e..274b4f1 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1266,7 +1266,6 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 	ret = video_register_device(dev->vfd_dec, VFL_TYPE_GRABBER, 0);
 	if (ret) {
 		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
-		video_device_release(dev->vfd_dec);
 		goto err_dec_reg;
 	}
 	v4l2_info(&dev->v4l2_dev,
@@ -1275,7 +1274,6 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 	ret = video_register_device(dev->vfd_enc, VFL_TYPE_GRABBER, 0);
 	if (ret) {
 		v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
-		video_device_release(dev->vfd_enc);
 		goto err_enc_reg;
 	}
 	v4l2_info(&dev->v4l2_dev,

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[patch] media: s5p-mfc: fix a couple double frees in probe Dan Carpenter <dan.carpenter@oracle.com> - 2016-06-11 22:00 +0200
  Re: [patch] media: s5p-mfc: fix a couple double frees in probe Javier Martinez Canillas <javier@dowhile0.org> - 2016-06-13 15:50 +0200

csiph-web