Commit 8a015e77 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wupeng Ma
Browse files

media: i2c: et8ek8: Don't strip remove function when driver is builtin 

stable inclusion
from stable-v6.6.33
commit c1a3803e5bb91c13e9ad582003e4288f67f06cd9
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA6S9P
CVE: CVE-2024-38611

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



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

[ Upstream commit 545b215736c5c4b354e182d99c578a472ac9bfce ]

Using __exit for the remove function results in the remove callback
being discarded with CONFIG_VIDEO_ET8EK8=y. When such a device gets
unbound (e.g. using sysfs or hotplug), the driver is just removed
without the cleanup being performed. This results in resource leaks. Fix
it by compiling in the remove callback unconditionally.

This also fixes a W=1 modpost warning:

	WARNING: modpost: drivers/media/i2c/et8ek8/et8ek8: section mismatch in reference: et8ek8_i2c_driver+0x10 (section: .data) -> et8ek8_remove (section: .exit.text)

Fixes: c5254e72 ("[media] media: Driver for Toshiba et8ek8 5MP sensor")
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>

Conflicts:
	drivers/media/i2c/et8ek8/et8ek8_driver.c
[Ma Wupeng: return val of et8ek8_remove lead to conflict]
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
parent 2b2a7e65

drivers/media/i2c/et8ek8/et8ek8_driver.c

+2 −2
Original line number Diff line number Diff line
@@ -1460,7 +1460,7 @@ static int et8ek8_probe(struct i2c_client *client) 
	return ret;

}



static int __exit et8ek8_remove(struct i2c_client *client)

static int et8ek8_remove(struct i2c_client *client)

{

	struct v4l2_subdev *subdev = i2c_get_clientdata(client);

	struct et8ek8_sensor *sensor = to_et8ek8_sensor(subdev);
@@ -1504,7 +1504,7 @@ static struct i2c_driver et8ek8_i2c_driver = { 
		.of_match_table	= et8ek8_of_table,

	},

	.probe_new	= et8ek8_probe,

	.remove		= __exit_p(et8ek8_remove),

	.remove		= et8ek8_remove,

	.id_table	= et8ek8_id_table,

};