Skip to content

Commit 54dea9e

Browse files
ZhangShurongUlrich Hecht
authored andcommitted
media: rj54n1cb0c: Fix memleak in rj54n1_probe()
[ Upstream commit fda55673ecdabf25f5ecc61b5ab17239257ac252 ] rj54n1_probe() won't clean all the allocated resources in fail path, which may causes the memleaks. Add v4l2_ctrl_handler_free() to prevent memleak. Fixes: f187352 ("media: i2c: Copy rj54n1cb0c soc_camera sensor driver") Signed-off-by: Zhang Shurong <zhang_shurong@foxmail.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Ulrich Hecht <uli@kernel.org>
1 parent 9255f4f commit 54dea9e

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/media/i2c/rj54n1cb0c.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,10 +1333,13 @@ static int rj54n1_probe(struct i2c_client *client,
13331333
V4L2_CID_GAIN, 0, 127, 1, 66);
13341334
v4l2_ctrl_new_std(&rj54n1->hdl, &rj54n1_ctrl_ops,
13351335
V4L2_CID_AUTO_WHITE_BALANCE, 0, 1, 1, 1);
1336-
rj54n1->subdev.ctrl_handler = &rj54n1->hdl;
1337-
if (rj54n1->hdl.error)
1338-
return rj54n1->hdl.error;
13391336

1337+
if (rj54n1->hdl.error) {
1338+
ret = rj54n1->hdl.error;
1339+
goto err_free_ctrl;
1340+
}
1341+
1342+
rj54n1->subdev.ctrl_handler = &rj54n1->hdl;
13401343
rj54n1->clk_div = clk_div;
13411344
rj54n1->rect.left = RJ54N1_COLUMN_SKIP;
13421345
rj54n1->rect.top = RJ54N1_ROW_SKIP;

0 commit comments

Comments
 (0)