[PATCH v3 1/2] staging: most: video: Protect pending_mbos and mute with list_lock

From: Shivani Patel

Date: Tue Nov 17 2026 - 12:06:54 EST


data_ready() and get_top_mbo() read mdev->pending_mbos without holding
mdev->list_lock, racing with comp_rx_data() which modifies the list
under mdev->list_lock. Also, comp_vdev_close() clears mdev->mute without
holding mdev->list_lock.

Acquire mdev->list_lock in data_ready(), get_top_mbo(), and when
clearing mdev->mute in comp_vdev_close(). Use list_first_entry_or_null()
in get_top_mbo() so comp_vdev_read() can drop the redundant data_ready()
check inside the read loop.

Signed-off-by: Shivani Patel <patelshivani2283@xxxxxxxxx>
---
v3:
- New patch added after inspecting list_lock usage per Dan Carpenter's
review of v2.

drivers/staging/most/video/video.c | 34 ++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index 3a0445ff6..92d5fbc9a 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -60,14 +60,27 @@ static inline struct comp_fh *to_comp_fh(struct file *filp)
static LIST_HEAD(video_devices);
static DEFINE_SPINLOCK(list_lock);

-static inline bool data_ready(struct most_video_dev *mdev)
+static bool data_ready(struct most_video_dev *mdev)
{
- return !list_empty(&mdev->pending_mbos);
+ unsigned long flags;
+ bool ready;
+
+ spin_lock_irqsave(&mdev->list_lock, flags);
+ ready = !list_empty(&mdev->pending_mbos);
+ spin_unlock_irqrestore(&mdev->list_lock, flags);
+
+ return ready;
}

-static inline struct mbo *get_top_mbo(struct most_video_dev *mdev)
+static struct mbo *get_top_mbo(struct most_video_dev *mdev)
{
- return list_first_entry(&mdev->pending_mbos, struct mbo, list);
+ struct mbo *mbo;
+
+ spin_lock_irq(&mdev->list_lock);
+ mbo = list_first_entry_or_null(&mdev->pending_mbos, struct mbo, list);
+ spin_unlock_irq(&mdev->list_lock);
+
+ return mbo;
}

static int comp_vdev_open(struct file *filp)
@@ -143,7 +156,9 @@ static int comp_vdev_close(struct file *filp)
}

most_stop_channel(mdev->iface, mdev->ch_idx, &comp);
+ spin_lock_irq(&mdev->list_lock);
mdev->mute = false;
+ spin_unlock_irq(&mdev->list_lock);

v4l2_fh_del(&fh->fh, filp);
v4l2_fh_exit(&fh->fh);
@@ -175,10 +190,15 @@ static ssize_t comp_vdev_read(struct file *filp, char __user *buf,
if (!data_ready(mdev))
return -EAGAIN;

- while (count > 0 && data_ready(mdev)) {
+ while (count > 0) {
struct mbo *const mbo = get_top_mbo(mdev);
- int const rem = mbo->processed_length - fh->offs;
- int const cnt = rem < count ? rem : count;
+ int rem, cnt;
+
+ if (!mbo)
+ break;
+
+ rem = mbo->processed_length - fh->offs;
+ cnt = rem < count ? rem : count;

if (copy_to_user(buf, mbo->virt_address + fh->offs, cnt)) {
v4l2_err(&mdev->v4l2_dev, "read: copy_to_user failed\n");
--
2.50.1 (Apple Git-155)