Commit 0eca2697 authored by Dan Carpenter's avatar Dan Carpenter Committed by Hongbo Li
Browse files

media: usb: go7007: s2250-board: fix leak in probe() 

stable inclusion
from stable-v4.19.238
commit b7dd177225355da55f8d80d8e568928e0eec3608
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBP72W
CVE: CVE-2022-49253

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=b7dd177225355da55f8d80d8e568928e0eec3608



--------------------------------

[ Upstream commit 67e4550e ]

Call i2c_unregister_device(audio) on this error path.

Fixes: d3b2ccd9 ("[media] s2250: convert to the control framework")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarHongbo Li <lihongbo22@huawei.com>
parent 3c67b39e

drivers/media/usb/go7007/s2250-board.c

+4 −6
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ static int s2250_probe(struct i2c_client *client, 
	u8 *data;

	struct go7007 *go = i2c_get_adapdata(adapter);

	struct go7007_usb *usb = go->hpi_context;

	int err = -EIO;



	audio = i2c_new_dummy(adapter, TLV320_ADDRESS >> 1);

	if (audio == NULL)
@@ -540,11 +541,8 @@ static int s2250_probe(struct i2c_client *client, 
		V4L2_CID_HUE, -512, 511, 1, 0);

	sd->ctrl_handler = &state->hdl;

	if (state->hdl.error) {

		int err = state->hdl.error;



		v4l2_ctrl_handler_free(&state->hdl);

		kfree(state);

		return err;

		err = state->hdl.error;

		goto fail;

	}



	state->std = V4L2_STD_NTSC;
@@ -608,7 +606,7 @@ static int s2250_probe(struct i2c_client *client, 
	i2c_unregister_device(audio);

	v4l2_ctrl_handler_free(&state->hdl);

	kfree(state);

	return -EIO;

	return err;

}



static int s2250_remove(struct i2c_client *client)