diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-08-23 08:12:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-08-26 06:30:32 -0300 |
| commit | 14d5511691e5290103bc480998bc322e68f139d4 (patch) | |
| tree | 7e66458a41b2efb251bfb8aa40f93a7e7873c14e | |
| parent | 8f4b5b0af7e451a4c6698ad3441dde8d1286c80d (diff) | |
| download | linux-0-day-14d5511691e5290103bc480998bc322e68f139d4.tar.gz linux-0-day-14d5511691e5290103bc480998bc322e68f139d4.tar.xz | |
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>
| -rw-r--r-- | drivers/media/cec/cec-notifier.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/cec-notifier.c index 52a867bde15fd..4d82a5522072e 100644 --- a/drivers/media/cec/cec-notifier.c +++ b/drivers/media/cec/cec-notifier.c @@ -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); } |