From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03700C3F68F for ; Thu, 19 Dec 2019 18:54:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB6BC222C2 for ; Thu, 19 Dec 2019 18:54:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781647; bh=/RNUeUREqrykBAIP7/HzWlhfDvzGVU7SOlxeDFPZBec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hSE5HOPLRJRURAhWCDn2n1U+JSCxJ+FACjt5/VW2fHKLOxdafqJwSd6FPlStH5aY6 0DAhfkp9hk9lCEl8QZGIkhGV8sPZM5H4EtYeGNj4NDCivCc2E1mzjmP60Zz6ZgFQVU TzUNEkzIqK3x81hb9fwGFmLg1+YpbxF4WkFJrDM0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730160AbfLSSyH (ORCPT ); Thu, 19 Dec 2019 13:54:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:49482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730113AbfLSSyH (ORCPT ); Thu, 19 Dec 2019 13:54:07 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5B6BA222C2; Thu, 19 Dec 2019 18:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781646; bh=/RNUeUREqrykBAIP7/HzWlhfDvzGVU7SOlxeDFPZBec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Htmm0SMmCegSi5jiG/4Q1TZmjKIbGLTZEv5+lmGZ/YSYE+W7fRATJGEdtyZhM95wH 48WTOvB47fLbwGfBzUW/RqQbqaiNXJdLOY9KfMr1VVq9U6TjXX8tNAdGBC2Q8jnZJN KbnUc7xKygmR4r2ktLyLC+3MXDWY1mDJJlO5OVxk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Lew , Srinivas Kandagatla , Arun Kumar Neelakantam , Bjorn Andersson Subject: [PATCH 5.4 22/80] rpmsg: glink: Fix reuse intents memory leak issue Date: Thu, 19 Dec 2019 19:34:14 +0100 Message-Id: <20191219183101.706269733@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183031.278083125@linuxfoundation.org> References: <20191219183031.278083125@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arun Kumar Neelakantam commit b85f6b601407347f5425c4c058d1b7871f5bf4f0 upstream. Memory allocated for re-usable intents are not freed during channel cleanup which causes memory leak in system. Check and free all re-usable memory to avoid memory leak. Fixes: 933b45da5d1d ("rpmsg: glink: Add support for TX intents") Cc: stable@vger.kernel.org Acked-By: Chris Lew Tested-by: Srinivas Kandagatla Signed-off-by: Arun Kumar Neelakantam Reported-by: Srinivas Kandagatla Signed-off-by: Bjorn Andersson Signed-off-by: Greg Kroah-Hartman --- drivers/rpmsg/qcom_glink_native.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -241,10 +241,19 @@ static void qcom_glink_channel_release(s { struct glink_channel *channel = container_of(ref, struct glink_channel, refcount); + struct glink_core_rx_intent *tmp; unsigned long flags; + int iid; spin_lock_irqsave(&channel->intent_lock, flags); + 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); spin_unlock_irqrestore(&channel->intent_lock, flags);