]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Revert "media: xc2028: avoid use-after-free in load_firmware_cb()"
authorDmitry Antipov <dmantipov@yandex.ru>
Mon, 11 Aug 2025 07:23:25 +0000 (10:23 +0300)
committerHans Verkuil <hverkuil+cisco@kernel.org>
Tue, 14 Oct 2025 13:07:36 +0000 (15:07 +0200)
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>
drivers/media/tuners/xc2028.c

index 8e6638e5f6889ab4b244abfb0cff087f5ad37eb9..807585d2dfde6be32552c4389b98e22a6ce4eeff 100644 (file)
@@ -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);