Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80930678 authored by Chris Lew's avatar Chris Lew
Browse files

rpmsg: glink: spi: Fix reuseable intent leak 



Reusuable intents are not freed on channel release, add handling to
free the local intents and destroy the intent idr structures in the
channel release work.

Change-Id: I4b314513737815d60eae2079c3c53828638ab372
Signed-off-by: default avatarChris Lew <clew@codeaurora.org>
parent 1df57774

drivers/rpmsg/qcom_glink_spi.c

+12 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -355,12 +355,21 @@ glink_spi_alloc_channel(struct glink_spi *glink, const char *name) 
static void glink_spi_channel_release(struct kref *ref)

{

	struct glink_spi_channel *channel;

	struct glink_spi_rx_intent *tmp;

	int iid;



	channel = container_of(ref, struct glink_spi_channel, refcount);

	CH_INFO(channel, "\n");



	mutex_lock(&channel->intent_lock);

	idr_for_each_entry(&channel->liids, tmp, iid) {

		kfree(tmp->data);

		kfree(tmp);

	}

	idr_destroy(&channel->liids);



	idr_for_each_entry(&channel->riids, tmp, iid)

		kfree(tmp);

	idr_destroy(&channel->riids);

	mutex_unlock(&channel->intent_lock);
@@ -2410,9 +2419,9 @@ static void glink_spi_remove(struct glink_spi *glink) 
	}



	/* Release any defunct local channels, waiting for close-req */

	idr_for_each_entry(&glink->lcids, channel, cid) {

	idr_for_each_entry(&glink->rcids, channel, cid) {

		kref_put(&channel->refcount, glink_spi_channel_release);

		idr_remove(&glink->lcids, cid);

		idr_remove(&glink->rcids, cid);

	}



	idr_destroy(&glink->lcids);