Skip to contentSkip to conversation

media: dvb_demux: fix potential TOCTOU race conditions

PATCH Superseded Gui-Dong Han 3 participants 5 messages Jan 20 – Feb 7

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 media: dvb_demux: fix potential TOCTOU race conditions

The dvb_demux functions handle frontend connectivity without holding dvbdemux->mutex during checks, leading to TOCTOU race conditions. In dvbdmx_write(), a concurrent dvbdmx_disconnect_frontend() can set demux->frontend to NULL after the check, causing a potential NULL pointer dereference. In dvbdmx_connect_frontend(), a concurrent connection could set the frontend between the check and the lock. This allows the second caller to overwrite the existing frontend, leading to resource leaks. The dvb_demux module should use its own mutex to ensure thread safety for these internal state checks.

Fix this by extending the lock scope. Move the frontend state checks inside the dvbdemux->mutex critical section to ensure the state remains stable during the operation.

This possible bug was found by our experimental static analysis tool, which analyzes lock usage to detect TOCTOU issues.

Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")

---
v2:
* Remove unnecessary parentheses to fix checkpatch --strict warning, as reported by Media CI robot.

---
 drivers/media/dvb-core/dvb_demux.c | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
drivers/media/dvb-core/dvb_demux.c +13 -8
index 7c4d86bfdd6c..38ffbbfef1f5 100644
@@ -1141,15 +1141,18 @@ 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))
+	if (mutex_lock_interruptible(&dvbdemux->mutex))
+		return -ERESTARTSYS;
+
+	if (!demux->frontend || demux->frontend->source != DMX_MEMORY_FE) {
+		mutex_unlock(&dvbdemux->mutex);
 		return -EINVAL;
+	}
 
 	p = memdup_user(buf, count);
-	if (IS_ERR(p))
+	if (IS_ERR(p)) {
+		mutex_unlock(&dvbdemux->mutex);
 		return PTR_ERR(p);
-	if (mutex_lock_interruptible(&dvbdemux->mutex)) {
-		kfree(p);
-		return -ERESTARTSYS;
 	}
 	dvb_dmx_swfilter(dvbdemux, p, count);
 	kfree(p);
@@ -1202,11 +1205,13 @@ static int dvbdmx_connect_frontend(struct dmx_demux *demux,
 {
 	struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
 
-	if (demux->frontend)
-		return -EINVAL;
-
 	mutex_lock(&dvbdemux->mutex);
 
+	if (demux->frontend) {
+		mutex_unlock(&dvbdemux->mutex);
+		return -EINVAL;
+	}
+
 	demux->frontend = frontend;
 	mutex_unlock(&dvbdemux->mutex);
 	return 0;
Signature · 1 line
2.43.0
#1 lore raw

…

Quoted 1 line

Fix this by extending the lock scope.

…

How do you think about to increase the application of scope-based resource management?
https://elixir.bootlin.com/linux/v6.19-rc5/source/include/linux/mutex.h#L253

Quoted 2 lines

This possible bug was found by our experimental static analysis tool, which analyzes lock usage to detect TOCTOU issues.

* Do you refer to any other source code analysis approach than LR-Miner?

* Will any additional background information become more helpful here?

Regards,
Markus

#2 lore raw
Quoted 7 lines · Markus Elfring

…

Quoted 1 line

Fix this by extending the lock scope.

…

How do you think about to increase the application of scope-based resource management?
https://elixir.bootlin.com/linux/v6.19-rc5/source/include/linux/mutex.h#L253

I did not use scope-based resource management because it was introduced into the kernel relatively recently. Since this patch fixes a bug that has existed for a long time and needs to be backported to older stable kernels, using standard mutex locking ensures better compatibility and easier backporting.

Quoted 6 lines
Quoted 2 lines

This possible bug was found by our experimental static analysis tool, which analyzes lock usage to detect TOCTOU issues.

* Do you refer to any other source code analysis approach than LR-Miner?

* Will any additional background information become more helpful here?

This is a new experimental static analysis tool we are developing. There is no additional background information to share at this moment.

Thanks.

maintainer
#3 lore raw
In reply to Markus Elfring
Quoted 11 lines · Markus Elfring

…

Quoted 1 line

Fix this by extending the lock scope.

…

How do you think about to increase the application of scope-based resource management?
https://elixir.bootlin.com/linux/v6.19-rc5/source/include/linux/mutex.h#L253

Quoted 2 lines

This possible bug was found by our experimental static analysis tool, which analyzes lock usage to detect TOCTOU issues.

Quoted 8 lines

* Do you refer to any other source code analysis approach than LR-Miner?

* Will any additional background information become more helpful here?

Regards,
Markus

Hi,

This is the semi-friendly patch-bot of Greg Kroah-Hartman.

Markus, you seem to have sent a nonsensical or otherwise pointless review comment to a patch submission on a Linux kernel developer mailing list. I strongly suggest that you not do this anymore. Please do not bother developers who are actively working to produce patches and features with comments that, in the end, are a waste of time.

Patch submitter, please ignore Markus's suggestion; you do not need to follow it at all. The person/bot/AI that sent it is being ignored by almost all Linux kernel maintainers for having a persistent pattern of behavior of producing distracting and pointless commentary, and inability to adapt to feedback. Please feel free to also ignore emails from them.

thanks,

greg k-h's patch email bot

#4 lore raw
In reply to Gui-Dong Han

Hi Mauro,

This is a gentle ping regarding the patch submitted on Jan 20.

I would appreciate it if you could take a look when you have a moment. Please let me know if there are any questions or if any further changes are needed.

Thanks.