Skip to contentSkip to conversation

rpmsg: virtio: fix possible double free in rpmsg_probe()

PATCH In review Hangyu Hua 3 participants 4 messages Apr 18, 2022 – Apr 26, 2022 Remote processor messaging (rpmsg)

lore
Share & tools
lore

Hangyu Hua

author
#0 lore raw

PATCH 1/1 rpmsg: virtio: fix possible double free in rpmsg_probe()

vch will be free in virtio_rpmsg_release_device() when rpmsg_ns_register_device() fails. There is no need to call kfree() again.

Fix this by changing error path from free_vch to free_ctrldev.

Fixes c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")
---
 drivers/rpmsg/virtio_rpmsg_bus.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +1 -3
index 3ede25b1f2e4..603233f0686e 100644
@@ -973,7 +973,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
 		err = rpmsg_ns_register_device(rpdev_ns);
 		if (err)
-			goto free_vch;
+			goto free_ctrldev;
 	}
 
 	/*
@@ -997,8 +997,6 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
 	return 0;
 
-free_vch:
-	kfree(vch);
 free_ctrldev:
 	rpmsg_virtio_del_ctrl_dev(rpdev_ctrl);
 free_coherent:
Signature · 1 line
2.25.1
Tested-by on v1 1/1
#1 lore raw
Quoted 7 lines · Hangyu Hua

vch will be free in virtio_rpmsg_release_device() when rpmsg_ns_register_device() fails. There is no need to call kfree() again.

Fix this by changing error path from free_vch to free_ctrldev.

Fixes c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")

Thanks,
Arnaud

Quoted 26 lines
---
 drivers/rpmsg/virtio_rpmsg_bus.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +1 -3
index 3ede25b1f2e4..603233f0686e 100644
@@ -973,7 +973,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
 		err = rpmsg_ns_register_device(rpdev_ns);
 		if (err)
-			goto free_vch;
+			goto free_ctrldev;
 	}
 
 	/*
@@ -997,8 +997,6 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
 	return 0;
 
-free_vch:
-	kfree(vch);
 free_ctrldev:
 	rpmsg_virtio_del_ctrl_dev(rpdev_ctrl);
 free_coherent:
maintainer
#2 lore raw
In reply to Hangyu Hua
Quoted 16 lines · Hangyu Hua

vch will be free in virtio_rpmsg_release_device() when rpmsg_ns_register_device() fails. There is no need to call kfree() again.

Fix this by changing error path from free_vch to free_ctrldev.

Fixes c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")
---
 drivers/rpmsg/virtio_rpmsg_bus.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +0 -0
index 3ede25b1f2e4..603233f0686e 100644

drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_probe(struct virtio_device *vdev) · line 976

Quoted 4 lines
drivers/rpmsg/virtio_rpmsg_bus.c +0 -1
@@ -973,7 +973,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
 		err = rpmsg_ns_register_device(rpdev_ns);
 		if (err)
-			goto free_vch;

Please add a comment that highlights where 'vch' will be free'd to avoid receiving patches that will introduce another kfree(). Same for your other patch.

In the next revision please use a cover letter and add Arnaud's patches to it.

Thanks,
Mathieu

Quoted 16 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1 -2
+			goto free_ctrldev;
 	}
 
 	/*
@@ -997,8 +997,6 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
 	return 0;
 
-free_vch:
-	kfree(vch);
 free_ctrldev:
 	rpmsg_virtio_del_ctrl_dev(rpdev_ctrl);
 free_coherent:
Signature · 1 line
2.25.1
author
#3 lore raw
Quoted 26 lines · Mathieu Poirier
Quoted 16 lines · Hangyu Hua

vch will be free in virtio_rpmsg_release_device() when rpmsg_ns_register_device() fails. There is no need to call kfree() again.

Fix this by changing error path from free_vch to free_ctrldev.

Fixes c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")
---
  drivers/rpmsg/virtio_rpmsg_bus.c | 4 +---
  1 file changed, 1 insertion(+), 3 deletions(-)
drivers/rpmsg/virtio_rpmsg_bus.c +0 -0
index 3ede25b1f2e4..603233f0686e 100644

drivers/rpmsg/virtio_rpmsg_bus.c static int rpmsg_probe(struct virtio_device *vdev) · line 976

Quoted 4 lines
drivers/rpmsg/virtio_rpmsg_bus.c +0 -1
@@ -973,7 +973,7 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
  		err = rpmsg_ns_register_device(rpdev_ns);
  		if (err)
-			goto free_vch;

Please add a comment that highlights where 'vch' will be free'd to avoid receiving patches that will introduce another kfree(). Same for your other patch.

Quoted 5 lines

In the next revision please use a cover letter and add Arnaud's patches to it.

Thanks,
Mathieu

Thanks! I will send a v2 later.

Quoted 16 lines
Quoted 16 lines
drivers/rpmsg/virtio_rpmsg_bus.c +1 -2
+			goto free_ctrldev;
  	}
 
  	/*
@@ -997,8 +997,6 @@ static int rpmsg_probe(struct virtio_device *vdev)
 
  	return 0;
 
-free_vch:
-	kfree(vch);
  free_ctrldev:
  	rpmsg_virtio_del_ctrl_dev(rpdev_ctrl);
  free_coherent:
Signature · 1 line
2.25.1