Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33c68533 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] dvb-usb-v2: postpone removal of media_device 



We should not remove the media_device until its last usage,
or we may have use after free troubles.

So, move the per-adapter media_device removal to happen at
the end of the adapter removal code.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 0230d60e

drivers/media/usb/dvb-usb-v2/dvb_usb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ static int dvb_usbv2_adapter_dvb_exit(struct dvb_usb_adapter *adap) 
		adap->demux.dmx.close(&adap->demux.dmx);

		dvb_dmxdev_release(&adap->dmxdev);

		dvb_dmx_release(&adap->demux);

		dvb_usbv2_media_device_unregister(adap);

		dvb_unregister_adapter(&adap->dvb_adap);

	}
@@ -852,6 +851,7 @@ static int dvb_usbv2_adapter_exit(struct dvb_usb_device *d) 
			dvb_usbv2_adapter_dvb_exit(&d->adapter[i]);

			dvb_usbv2_adapter_stream_exit(&d->adapter[i]);

			dvb_usbv2_adapter_frontend_exit(&d->adapter[i]);

			dvb_usbv2_media_device_unregister(&d->adapter[i]);

		}

	}