From patchwork Fri Jun 1 23:32:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10444427 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2D9A6603D7 for ; Fri, 1 Jun 2018 23:34:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20D312899D for ; Fri, 1 Jun 2018 23:34:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1593F28A10; Fri, 1 Jun 2018 23:34:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF1F6289BB for ; Fri, 1 Jun 2018 23:34:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751041AbeFAXei (ORCPT ); Fri, 1 Jun 2018 19:34:38 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:38490 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750974AbeFAXeh (ORCPT ); Fri, 1 Jun 2018 19:34:37 -0400 Received: by mail-wm0-f66.google.com with SMTP id m129-v6so5042711wmb.3 for ; Fri, 01 Jun 2018 16:34:36 -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; bh=TnW5N/xqTC2ix3EopWW8JQWBEhCdLlAOTRlfdsrpZXU=; b=L5PROsJH4L6I20u/DGFvBvAcXkoW2NI3aL30GVTNvFXyPUVuFkKJiwnSaR9cR+/zPE ssd3LbNgwo874JLtUc99n7NaSzjumf97KOMycvhagFfWpyJ7SNpFcX4TsTGym+rTWS56 Kv1ukU6f0y69mKNYxF4v9EroFvCcnNWAm09ZU= 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; bh=TnW5N/xqTC2ix3EopWW8JQWBEhCdLlAOTRlfdsrpZXU=; b=UHXZWNskmh96Qe8Sm9iJxnd48z398C5hIeof0M/umXAXc4DOfwArnDAq6GXNhDUk+4 CZzHMJWJ4kBJCcjtFY+IoAnYlXuKNCUvH0olXw+KjlI8RXyF8owSJeM/2/xR63Lz3fy9 LyhbCIU2/20lm9hdEkKnVYQKVfsLg3ocNMSraDNDMuFoxQSE+iQ1J+TokPemcAyxeKb6 N1kCcTUyyHI5DSG2uPkcNV/bOa49aZ+aB/qjQ+zaUwrv6eglnXrn2dITqj99Rz56WJum 3X8Fcmos/7VVCbQvpkk1xlrja89FGZ9AUrLvyxfhBP8gAkBSG6CGCo+cIwdTudDJUlHj 7HLg== X-Gm-Message-State: ALKqPwef1CVVwla//ci6xYqlJNqGcPPOaF/EsKwi+M9CTvZskj9QPo8q aSv6nv5P0e1DXdHtCnrFFYVahg== X-Google-Smtp-Source: ADUXVKIWO/FKYLbsnK4mzFx9fjRAdyin6Ml1Djbg1Z0z4IQOtzooIKgg9glWrbt341nq8L42exgTHw== X-Received: by 2002:a1c:988d:: with SMTP id a135-v6mr4143319wme.79.1527896076047; Fri, 01 Jun 2018 16:34:36 -0700 (PDT) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id f81-v6sm4466804wmh.32.2018.06.01.16.34.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Jun 2018 16:34:35 -0700 (PDT) From: Srinivas Kandagatla To: ohad@wizery.com, bjorn.andersson@linaro.org Cc: linux-remoteproc@vger.kernel.org, linux-arm-msm@vger.kernel.org, bgoswami@codeaurora.org, linux-kernel@vger.kernel.org, rohkumar@qti.qualcomm.com, Srinivas Kandagatla , stable@vger.kernel.org Subject: [PATCH] rpmsg: smd: do not use mananged resources for endpoints and channels Date: Sat, 2 Jun 2018 00:32:31 +0100 Message-Id: <20180601233231.11230-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.16.2 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP All the managed resources would be freed by the time release function is invoked. Handling such memory in qcom_smd_edge_release() would do bad things. Found this issue while testing Audio usecase where the dsp is started up and shutdown in a loop. This patch fixes this issue by using simple kzalloc for allocating channel->name and channel which is then freed in qcom_smd_edge_release(). Without this patch restarting a remoteproc would crash the system. Fixes: 53e2822e56c7 ("rpmsg: Introduce Qualcomm SMD backend") Cc: Signed-off-by: Srinivas Kandagatla --- drivers/rpmsg/qcom_smd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 5ce9bf7b897d..49d3838dfc3d 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1100,12 +1100,12 @@ static struct qcom_smd_channel *qcom_smd_create_channel(struct qcom_smd_edge *ed void *info; int ret; - channel = devm_kzalloc(&edge->dev, sizeof(*channel), GFP_KERNEL); + channel = kzalloc(sizeof(*channel), GFP_KERNEL); if (!channel) return ERR_PTR(-ENOMEM); channel->edge = edge; - channel->name = devm_kstrdup(&edge->dev, name, GFP_KERNEL); + channel->name = kstrdup(name, GFP_KERNEL); if (!channel->name) return ERR_PTR(-ENOMEM); @@ -1156,8 +1156,8 @@ static struct qcom_smd_channel *qcom_smd_create_channel(struct qcom_smd_edge *ed return channel; free_name_and_channel: - devm_kfree(&edge->dev, channel->name); - devm_kfree(&edge->dev, channel); + kfree(channel->name); + kfree(channel); return ERR_PTR(ret); } @@ -1380,11 +1380,13 @@ static void qcom_smd_edge_release(struct device *dev) { struct qcom_smd_channel *channel; struct qcom_smd_edge *edge = to_smd_edge(dev); + struct list_head *this, *tmp; - list_for_each_entry(channel, &edge->channels, list) { - SET_RX_CHANNEL_INFO(channel, state, SMD_CHANNEL_CLOSED); - SET_RX_CHANNEL_INFO(channel, head, 0); - SET_RX_CHANNEL_INFO(channel, tail, 0); + list_for_each_safe(this, tmp, &edge->channels) { + channel = list_entry(this, struct qcom_smd_channel, list); + list_del(&channel->list); + kfree(channel->name); + kfree(channel); } kfree(edge);