Commit 14d55116 authored Aug 23, 2019 by Hans Verkuil Committed by Mauro Carvalho Chehab Aug 26, 2019

media: cec-notifier: clear cec_adap in cec_notifier_unregister



If cec_notifier_cec_adap_unregister() is called before
cec_unregister_adapter() then everything is OK (and this is the
case today). But if it is the other way around, then
cec_notifier_unregister() is called first, and that doesn't
set n->cec_adap to NULL.

So if e.g. cec_notifier_set_phys_addr() is called after
cec_notifier_unregister() but before cec_unregister_adapter()
then n->cec_adap points to an unregistered and likely deleted
cec adapter. So just set n->cec_adap->notifier and n->cec_adap
to NULL for rubustness.

Eventually cec_notifier_unregister will disappear and this will
be simplified substantially.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent 8f4b5b0a

drivers/media/cec/cec-notifier.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,8 @@ void cec_notifier_unregister(struct cec_notifier *n)

		mutex_lock(&n->lock);
		n->callback = NULL;
		n->cec_adap->notifier = NULL;
		n->cec_adap = NULL;
		mutex_unlock(&n->lock);
		cec_notifier_put(n);
		}

Admin message