]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
media: cec: cec-api: add locking in cec_release()
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Fri, 23 Feb 2024 12:25:55 +0000 (12:25 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 16 Jun 2024 11:39:44 +0000 (13:39 +0200)
[ Upstream commit 42bcaacae924bf18ae387c3f78c202df0b739292 ]

When cec_release() uses fh->msgs it has to take fh->lock,
otherwise the list can get corrupted.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reported-by: Yang, Chenyuan <cy54@illinois.edu>
Closes: https://lore.kernel.org/linux-media/PH7PR11MB57688E64ADE4FE82E658D86DA09EA@PH7PR11MB5768.namprd11.prod.outlook.com/
Fixes: ca684386e6e2 ("[media] cec: add HDMI CEC framework (api)")
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/cec/core/cec-api.c

index 52c30e4e2005571bcece84a717d6cc59c99bb6b2..4510a4bec659a4c57d741ad7eea302b6627f486e 100644 (file)
@@ -678,6 +678,8 @@ static int cec_release(struct inode *inode, struct file *filp)
                list_del(&data->xfer_list);
        }
        mutex_unlock(&adap->lock);
+
+       mutex_lock(&fh->lock);
        while (!list_empty(&fh->msgs)) {
                struct cec_msg_entry *entry =
                        list_first_entry(&fh->msgs, struct cec_msg_entry, list);
@@ -695,6 +697,7 @@ static int cec_release(struct inode *inode, struct file *filp)
                        kfree(entry);
                }
        }
+       mutex_unlock(&fh->lock);
        kfree(fh);
 
        cec_put_device(devnode);