]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
media: dvb-core: always call invoke_release() in fe_free()
authorDaniel Scheller <d.scheller@gmx.net>
Sun, 29 Oct 2017 15:43:22 +0000 (11:43 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 7 Nov 2017 10:39:41 +0000 (05:39 -0500)
Follow-up to: ead666000a5f ("media: dvb_frontend: only use kref after initialized")

The aforementioned commit fixed refcount OOPSes when demod driver attaching
succeeded but tuner driver didn't. However, the use count of the attached
demod drivers don't go back to zero and thus couldn't be cleanly unloaded.
Improve on this by calling dvb_frontend_invoke_release() in
__dvb_frontend_free() regardless of fepriv being NULL, instead of returning
when fepriv is NULL. This is safe to do since _invoke_release() will check
for passed pointers being valid before calling the .release() function.

[mchehab@s-opensource.com: changed the logic a little bit to reduce
 conflicts with another bug fix patch under review]
Fixes: ead666000a5f ("media: dvb_frontend: only use kref after initialized")
Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/dvb-core/dvb_frontend.c

index daaf969719e4aa7508549c28256cf6e1721541aa..d485d5f6cc8874f46ec58823aed549e39f840c00 100644 (file)
@@ -145,13 +145,14 @@ static void __dvb_frontend_free(struct dvb_frontend *fe)
 {
        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 
-       if (!fepriv)
-               return;
-
-       dvb_free_device(fepriv->dvbdev);
+       if (fepriv)
+               dvb_free_device(fepriv->dvbdev);
 
        dvb_frontend_invoke_release(fe, fe->ops.release);
 
+       if (!fepriv)
+               return;
+
        kfree(fepriv);
        fe->frontend_priv = NULL;
 }