From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Mon, 11 Aug 2025 07:23:25 +0000 (+0300)
Subject: Revert "media: xc2028: avoid use-after-free in load_firmware_cb()"
X-Git-Tag: v6.19-rc1~159^2~246
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c64c5d91e98471b44cca0999542c7ebcc385c51;p=thirdparty%2Fkernel%2Flinux.git

Revert "media: xc2028: avoid use-after-free in load_firmware_cb()"

Revert commit 68594cec291f ("media: xc2028: avoid use-after-free
in load_firmware_cb()") since it doesn't make sense to check
dangling 'struct dvb_frontend *' passed to 'load_firmware_cb()'.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
---

diff --git a/drivers/media/tuners/xc2028.c b/drivers/media/tuners/xc2028.c
index 8e6638e5f6889..807585d2dfde6 100644
--- a/drivers/media/tuners/xc2028.c
+++ b/drivers/media/tuners/xc2028.c
@@ -1361,16 +1361,9 @@ static void load_firmware_cb(const struct firmware *fw,
 			     void *context)
 {
 	struct dvb_frontend *fe = context;
-	struct xc2028_data *priv;
+	struct xc2028_data *priv = fe->tuner_priv;
 	int rc;
 
-	if (!fe) {
-		pr_warn("xc2028: No frontend in %s\n", __func__);
-		return;
-	}
-
-	priv = fe->tuner_priv;
-
 	tuner_dbg("request_firmware_nowait(): %s\n", fw ? "OK" : "error");
 	if (!fw) {
 		tuner_err("Could not load firmware %s.\n", priv->fname);