Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Tuo Li <islituo@gmail.com>
To:     mchehab@kernel.org, hverkuil-cisco@xs4all.nl
Cc:     linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
        baijiaju1990@outlook.com, Tuo Li <islituo@gmail.com>,
        BassCheck <bass@buaa.edu.cn>
Subject: [PATCH] media: bt8xx: Fix a possible data race in buffer_queue()
Date:   Wed, 28 Jun 2023 15:19:51 +0800
Message-Id: <20230628071951.1011421-1-islituo@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

The variable btv->loop_irq is often protected by the lock btv->s_lock when
is accessed. Here is an example in bttv_irq_timeout():

  spin_lock_irqsave(&btv->s_lock,flags); 
  ...
  btv->loop_irq = 0;
  ...
  spin_unlock_irqrestore(&btv->s_lock,flags);

However, it is accessed without holding the lock btv->s_lock in 
buffer_queue():

  btv->loop_irq |= 1;

And thus a data race can occur.
To fix this possible data race, a lock and unlock pair is added when
accessing the variable btv->loop_irq in buffer_queue().

Reported-by: BassCheck <bass@buaa.edu.cn>
Signed-off-by: Tuo Li <islituo@gmail.com>
---
 drivers/media/pci/bt8xx/bttv-driver.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 734f02b91aa3..241c51951627 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1617,13 +1617,16 @@ buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 	struct bttv_buffer *buf = container_of(vb,struct bttv_buffer,vb);
 	struct bttv_fh *fh = q->priv_data;
 	struct bttv    *btv = fh->btv;
+	unsigned long flags;
 
+	spin_lock_irqsave(&btv->s_lock,flags);
 	buf->vb.state = VIDEOBUF_QUEUED;
 	list_add_tail(&buf->vb.queue,&btv->capture);
 	if (!btv->curr.frame_irq) {
 		btv->loop_irq |= 1;
 		bttv_set_dma(btv, 0x03);
 	}
+	spin_unlock_irqrestore(&btv->s_lock,flags);
 }
 
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
-- 
2.34.1