From patchwork Mon Jun 4 09:39:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10446157 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 76F86603D7 for ; Mon, 4 Jun 2018 09:41:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 669452899D for ; Mon, 4 Jun 2018 09:41:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5B54828B3E; Mon, 4 Jun 2018 09:41:26 +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 0E96E2899D for ; Mon, 4 Jun 2018 09:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751989AbeFDJlN (ORCPT ); Mon, 4 Jun 2018 05:41:13 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:39104 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751933AbeFDJlM (ORCPT ); Mon, 4 Jun 2018 05:41:12 -0400 Received: by mail-wm0-f67.google.com with SMTP id p11-v6so13030603wmc.4 for ; Mon, 04 Jun 2018 02:41:11 -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=HSmS4R9NcyX61okIafoihDvvU8AZ0fAjqT+5yWZyCX0=; b=LjVevsbxygEWcgAQt5zR+lueMlrVySRjeVhSRPqMF3OipIqJGJNXEZJv8Y1OX+1kKh RgS8opln06tgnRl9ba2ZbRrVvpgtiySQA/m+jvDA9PoVyG5JU8td3Cw3ronZtewyUcuv SNRZJ7f5L3Vf2ir1Dt/38pLFM2+QbpdYuGqko= 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=HSmS4R9NcyX61okIafoihDvvU8AZ0fAjqT+5yWZyCX0=; b=SRlTxMlUhTFlDNm8M4whxj+caqkkq3IqOCWF1I+e/ffTs4p5W0p6l5lbx6yzvSTuqS wlHqfe9iHeirEKM8xu4MIUXer+rFxDX4qEBRyZX1kYvMA1dGS+VZWRO5bQ/7fQBDtCnR H5D0wq0lW8LsDj6bOzlTgtXv374Xb31hDjwF1sQbZ2JiNCHvI76t62nXeJGwcad/tYnb d6fAhARHuYsp9uf4iO0VMO1dQrnkgP3aJQPgSX9ni8QAO9Usg+kjCGlL7gFt8hLy1xCb GFIvC0qYPp7NqViCkcQqKlWyT1o8zS4zGCQO5RP9nKGHM1STG3ExdpvNo7y10ADrB9MD o76A== X-Gm-Message-State: APt69E3MT+1sW4hLJxJbZARtxWQ0uadFiKHotz2ODkSYLjpIZZpZLIYr 1489sx33EbD47zzznqRRVXW+6g== X-Google-Smtp-Source: ADUXVKLyS24tid4Sb6vMtocMN6lGak7tYWCTbkpXImpfOlsADNbk/O7OVTxvt0TM3CHYOE/mdykmaQ== X-Received: by 2002:a1c:3448:: with SMTP id b69-v6mr1321273wma.0.1528105271218; Mon, 04 Jun 2018 02:41:11 -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 f24-v6sm7133499wmc.0.2018.06.04.02.41.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Jun 2018 02:41:10 -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 v2] rpmsg: smd: do not use mananged resources for endpoints and channels Date: Mon, 4 Jun 2018 10:39:01 +0100 Message-Id: <20180604093901.6963-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, 9 insertions(+), 9 deletions(-) diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 5ce9bf7b897d..f63adcd95eb0 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); } @@ -1378,13 +1378,13 @@ static int qcom_smd_parse_edge(struct device *dev, */ static void qcom_smd_edge_release(struct device *dev) { - struct qcom_smd_channel *channel; + struct qcom_smd_channel *channel, *tmp; struct qcom_smd_edge *edge = to_smd_edge(dev); - 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_entry_safe(channel, tmp, &edge->channels, list) { + list_del(&channel->list); + kfree(channel->name); + kfree(channel); } kfree(edge);