Skip to contentSkip to conversation

media: dvb-core: Fix a possible null-pointer dereference due to data race in dvbdmx_write()

PATCH New Tuo Li 1 participant 1 message Jun 26, 2023 Media (V4L/DVB)

lore
Share & tools
lore

Tuo Li

author
#0 lore raw

PATCH 1/1 media: dvb-core: Fix a possible null-pointer dereference due to data race in dvbdmx_write()

The struct field dmx_demux.frontend is often protected by the lock dvb_demux.mutex when is accessed. Here is an example in dvbdmx_connect_frontend():

  mutex_lock(&dvbdemux->mutex);

  demux->frontend = frontend;
  mutex_unlock(&dvbdemux->mutex);

However, the variable demux->frontend is accessed without holding the lock dvbdemux->mutex in dvbdmx_write():

  if ((!demux->frontend) || (demux->frontend->source != DMX_MEMORY_FE))

In my opinion, this may be a harmful race, because if demux->fontend is set to NULL right after the first condition is checked, a null-pointer dereference can occur when accessing the field demux->frontend->source.

To fix this possible null-pointer dereference caused by data race, a lock and unlock pair is added when accessing the variable demux->frontend.

---
 drivers/media/dvb-core/dvb_demux.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/media/dvb-core/dvb_demux.c +6 -2
index 7c4d86bfdd6c..d26738e3310a 100644
@@ -1140,9 +1140,13 @@ static int dvbdmx_write(struct dmx_demux *demux, const char __user *buf, size_t
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
 	void *p;
-
-	if ((!demux->frontend) || (demux->frontend->source != DMX_MEMORY_FE))
+	
+	mutex_lock(&dvbdemux->mutex);
+	if ((!demux->frontend) || (demux->frontend->source != DMX_MEMORY_FE)) {
+		mutex_unlock(&dvbdemux->mutex);
 		return -EINVAL;
+	}
+	mutex_unlock(&dvbdemux->mutex);
 
 	p = memdup_user(buf, count);
 	if (IS_ERR(p))
Signature · 1 line
2.34.1