lkml.org 
[lkml]   [2018]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 108/157] rpmsg: smd: do not use mananged resources for endpoints and channels
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    commit 4a2e84c6ed85434ce7843e4844b4d3263f7e233b upstream.

    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: <stable@vger.kernel.org>
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/rpmsg/qcom_smd.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    --- a/drivers/rpmsg/qcom_smd.c
    +++ b/drivers/rpmsg/qcom_smd.c
    @@ -1043,12 +1043,12 @@ static struct qcom_smd_channel *qcom_smd
    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);

    @@ -1098,8 +1098,8 @@ static struct qcom_smd_channel *qcom_smd
    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);
    }
    @@ -1320,13 +1320,13 @@ static int qcom_smd_parse_edge(struct de
    */
    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);

    \
     
     \ /
      Last update: 2018-07-01 18:34    [W:2.495 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site