Commit ab20f38c authored by Hans Verkuil's avatar Hans Verkuil Committed by Greg Kroah-Hartman

media: cec-notifier: clear cec_adap in cec_notifier_unregister

[ Upstream commit 14d55116 ]

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d51268d7
...@@ -123,6 +123,8 @@ void cec_notifier_unregister(struct cec_notifier *n) ...@@ -123,6 +123,8 @@ void cec_notifier_unregister(struct cec_notifier *n)
{ {
mutex_lock(&n->lock); mutex_lock(&n->lock);
n->callback = NULL; n->callback = NULL;
n->cec_adap->notifier = NULL;
n->cec_adap = NULL;
mutex_unlock(&n->lock); mutex_unlock(&n->lock);
cec_notifier_put(n); cec_notifier_put(n);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment