Skip to contentSkip to conversation

staging: vchiq: Fix refcounting bug in buffer_from_host()

PATCH New Dan Carpenter 1 participant 1 message Jul 22, 2020

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

PATCH 1/1 staging: vchiq: Fix refcounting bug in buffer_from_host()

If we fail to queue the buffer then it can never be dequeued. This can lead to a forever loop in stop_streaming() when we wait for everything to finish.

Fixes 70ec64ccdaac ("staging: bcm2835-camera: Ensure all buffers are returned on disable")

---
From static analysis. Not tested. Please review carefully etc.

 drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +2 -0
index dc767730db43..65dd2a55b3da 100644
@@ -441,6 +441,8 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
 	ret = vchiq_queue_kernel_message(instance->service_handle, &m,
 					 sizeof(struct mmal_msg_header) +
 					 sizeof(m.u.buffer_from_host));
+	if (ret)
+		atomic_dec(&port->buffers_with_vpu);
 
 	vchiq_release_service(instance->service_handle);
 
Signature · 1 line
2.27.0