Attempting to transmit rx_done messages after the GLINK instance is
being torn down will cause use after free and memory leaks. So cancel
the intent_work and free up the pending intents.

Fixes: 1d2ea36eead9 ("rpmsg: glink: Add rx done command")
Cc: [email protected]
Signed-off-by: Bjorn Andersson <[email protected]>
---
 drivers/rpmsg/qcom_glink_native.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/rpmsg/qcom_glink_native.c 
b/drivers/rpmsg/qcom_glink_native.c
index 89e02baea2d0..0d7518a6ebf0 100644
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -241,11 +241,23 @@ static void qcom_glink_channel_release(struct kref *ref)
 {
        struct glink_channel *channel = container_of(ref, struct glink_channel,
                                                     refcount);
+       struct glink_core_rx_intent *intent;
        struct glink_core_rx_intent *tmp;
        unsigned long flags;
        int iid;
 
+       /* cancel pending rx_done work */
+       cancel_work_sync(&channel->intent_work);
+
        spin_lock_irqsave(&channel->intent_lock, flags);
+       /* Free all non-reuse intents pending rx_done work */
+       list_for_each_entry_safe(intent, tmp, &channel->done_intents, node) {
+               if (!intent->reuse) {
+                       kfree(intent->data);
+                       kfree(intent);
+               }
+       }
+
        idr_for_each_entry(&channel->liids, tmp, iid) {
                kfree(tmp->data);
                kfree(tmp);
-- 
2.18.0

Reply via email to