Unverified Commit 3b7b1989 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15332 Fix CVE-2022-49253 

Merge Pull Request from: @ci-robot 
 
PR sync from: Hongbo Li <lihongbo22@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/IFZDCEF44MXF2DG3O7DRHOBRQ635TZOP/ 
Fix CVE-2022-49253.

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

 
https://gitee.com/src-openeuler/kernel/issues/IBP72W 
 
Link:https://gitee.com/openeuler/kernel/pulls/15332

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 847bf225 0eca2697

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)