Skip to contentSkip to conversation

media: dvbdev: fix uaf in dvb_remove_device()

PATCH In review Jeffin Philip 2 participants 3 messages Aug 22 – Aug 31

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

PATCH 1/1 media: dvbdev: fix uaf in dvb_remove_device()

In dvb_remove_device(), dvb_media_device_free(), device_destroy() and list_del() all dereference dvbdev regardless of its refcount. Thus, if refcount for dvbdev is 1, it can be freed and we operate on freed memory causing a UAF. Fix this by moving dvb_device_put() at the end of dvb_remove_device() so dvbdev members can be safely freed and assigned NULL when dvbdev is alive.

Reported-by [email protected]
Fixes 0fc044b2b5e2 ("media: dvbdev: adopts refcnt to avoid UAF")
---
 drivers/media/dvb-core/dvbdev.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dvbdev.c +2 -1
index d753d329502a..9aa4b8fd7379 100644
@@ -598,7 +598,6 @@ void dvb_remove_device(struct dvb_device *dvbdev)
 
 	down_write(&minor_rwsem);
 	dvb_minors[dvbdev->minor] = NULL;
-	dvb_device_put(dvbdev);
 	up_write(&minor_rwsem);
 
 	dvb_media_device_free(dvbdev);
@@ -606,6 +605,8 @@ void dvb_remove_device(struct dvb_device *dvbdev)
 	device_destroy(dvb_class, MKDEV(DVB_MAJOR, dvbdev->minor));
 
 	list_del(&dvbdev->list_head);
+
+	dvb_device_put(dvbdev);
 }
 EXPORT_SYMBOL(dvb_remove_device);
 
Signature · 1 line
2.55.0
#1 lore raw
Quoted 30 lines · Jeffin Philip

In dvb_remove_device(), dvb_media_device_free(), device_destroy() and list_del() all dereference dvbdev regardless of its refcount. Thus, if refcount for dvbdev is 1, it can be freed and we operate on freed memory causing a UAF. Fix this by moving dvb_device_put() at the end of dvb_remove_device() so dvbdev members can be safely freed and assigned NULL when dvbdev is alive.

Reported-by [email protected]
Fixes 0fc044b2b5e2 ("media: dvbdev: adopts refcnt to avoid UAF")

---
drivers/media/dvb-core/dvbdev.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dvbdev.c +0 -1
index d753d329502a..9aa4b8fd7379 100644
@@ -598,7 +598,6 @@ void dvb_remove_device(struct dvb_device *dvbdev)
 
 	down_write(&minor_rwsem);
 	dvb_minors[dvbdev->minor] = NULL;
-	dvb_device_put(dvbdev);
 	up_write(&minor_rwsem);
 
 	dvb_media_device_free(dvbdev);

drivers/media/dvb-core/dvbdev.c void dvb_remove_device(struct dvb_device *dvbdev) · line 612

Quoted 8 lines
drivers/media/dvb-core/dvbdev.c +2 -0
@@ -606,6 +605,8 @@ void dvb_remove_device(struct dvb_device *dvbdev)
 	device_destroy(dvb_class, MKDEV(DVB_MAJOR, dvbdev->minor));
 
 	list_del(&dvbdev->list_head);
+
+	dvb_device_put(dvbdev);
 }
 EXPORT_SYMBOL(dvb_remove_device);
 

Friendly ping, let me know if you want me to fix anything.

Thanks,
Jeffin.

Reviewed-by
#2 lore raw
Quoted 9 lines · Jeffin Philip
Quoted 7 lines · Jeffin Philip

In dvb_remove_device(), dvb_media_device_free(), device_destroy() and list_del() all dereference dvbdev regardless of its refcount. Thus, if refcount for dvbdev is 1, it can be freed and we operate on freed memory causing a UAF. Fix this by moving dvb_device_put() at the end of dvb_remove_device() so dvbdev members can be safely freed and assigned NULL when dvbdev is alive.

Quoted 36 lines
Quoted 22 lines
Reported-by [email protected]
Fixes 0fc044b2b5e2 ("media: dvbdev: adopts refcnt to avoid UAF")

---
drivers/media/dvb-core/dvbdev.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/dvb-core/dvbdev.c +0 -1
index d753d329502a..9aa4b8fd7379 100644
@@ -598,7 +598,6 @@ void dvb_remove_device(struct dvb_device *dvbdev)
 
      down_write(&minor_rwsem);
      dvb_minors[dvbdev->minor] = NULL;
-      dvb_device_put(dvbdev);
      up_write(&minor_rwsem);
 
      dvb_media_device_free(dvbdev);

drivers/media/dvb-core/dvbdev.c void dvb_remove_device(struct dvb_device *dvbdev)

Quoted 9 lines
drivers/media/dvb-core/dvbdev.c +2 -1
@@ -606,6 +605,8 @@ void dvb_remove_device(struct dvb_device *dvbdev)
      device_destroy(dvb_class, MKDEV(DVB_MAJOR, dvbdev->minor));
 
      list_del(&dvbdev->list_head);
+
+      dvb_device_put(dvbdev);
 }
 EXPORT_SYMBOL(dvb_remove_device);
 
--

Friendly ping, let me know if you want me to fix anything.

Thanks,
Jeffin.

Signature · 1 line
Ricardo Ribalda