From patchwork Fri Oct 4 22:26:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11175415 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 792811747 for ; Fri, 4 Oct 2019 22:27:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57212222C0 for ; Fri, 4 Oct 2019 22:27:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="F5uG1Agm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729441AbfJDW1L (ORCPT ); Fri, 4 Oct 2019 18:27:11 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:40805 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726002AbfJDW1K (ORCPT ); Fri, 4 Oct 2019 18:27:10 -0400 Received: by mail-pl1-f195.google.com with SMTP id d22so3768804pll.7 for ; Fri, 04 Oct 2019 15:27:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DB10pg/WIJaO+aJTgK4OR+kGpHxX86yfhLw/UszwpCo=; b=F5uG1Agmj1h9uJUlUsYaVzT9Nk4sqGpyY9EGmbmREWfkyCLX2Jypf/Vry8EYBqlg6y +5mmeuhecQk1H+/FUJ58m8WKZSUIoDROJ8cXuO1cXJvn/DtQTX99y99UNqV/CUfGWq8C SLXTxvc6qPmiBMbAvEABZWldwZ1/NsRYGGkdCpPAC6bXZkrlGLpbaVIa2KJrd/ryeSUT XXIocsOg0tgXtlaZzEHywwXICMIe9YedFnHjO/H7IocH1cuUcRViUrK4sRCS4QF4iFGg WyQKekfWYrwKHwUU39tkpVTyLDxjY9zrGkI6vCGtwxbHZyG1TjIYCAIyJ/jk6sDNyRf9 mTiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DB10pg/WIJaO+aJTgK4OR+kGpHxX86yfhLw/UszwpCo=; b=ECDOUHd6NACWwL1yxNsYR0TnGJZEuW6D0mSC+S29O6SaeyuTiLDLaT7uDSluTnrLGu GqnAfOMbM3Y3xROyq2VL1DSCJmL0TJPa8AvNOjljlhqkKInjz3HNJ6L/6/4oWNJWTuUD pxiYZLa11XaihDnXIeO9WzVOykxqnPw2vHAEA2qoFqzkD+IJ/xagLub/rPYONg/BK178 tUyLLzfQyxGBWJa8BqCjkTPQso1PJMCkuVK0Mowy+nsXpGIgrXcaU38V3ipYIF/Gmymu mQBkQ0OrTnfxMmWWvt8lMYR/+6J7WhPtqMpt3BPrXGkCT7KukdvwCxacLmsPilYpB0Xa xyIg== X-Gm-Message-State: APjAAAW8yWMe4zD9fwSDx9Y+xypS+HpZOH5LrL6C/95dzqoJt14Zq+Xi 0kGI4/goiLOhj86XYvi1rQU0NQ== X-Google-Smtp-Source: APXvYqzCVLSpk4OE/L2LUrTXd1xxgCf0fxLXYqqbD9oR0XvRr6RzlVdImC6SxgRlG2DIsUN1EbXjmQ== X-Received: by 2002:a17:902:aa08:: with SMTP id be8mr3333013plb.317.1570228029737; Fri, 04 Oct 2019 15:27:09 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id x37sm6328136pgl.18.2019.10.04.15.27.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Oct 2019 15:27:08 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 1/6] rpmsg: glink: Fix reuse intents memory leak issue Date: Fri, 4 Oct 2019 15:26:57 -0700 Message-Id: <20191004222702.8632-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191004222702.8632-1-bjorn.andersson@linaro.org> References: <20191004222702.8632-1-bjorn.andersson@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Arun Kumar Neelakantam 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 Tested-by: Srinivas Kandagatla Signed-off-by: Arun Kumar Neelakantam Reported-by: Srinivas Kandagatla Signed-off-by: Bjorn Andersson Acked-By: Chris Lew --- Changes since v1: - None drivers/rpmsg/qcom_glink_native.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 621f1afd4d6b..9355ce26fd98 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -241,10 +241,19 @@ 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 *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);