lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 033/314] misc: fastrpc: fix potential fastrpc_invoke_ctx leak
    Date
    From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

    [ Upstream commit 74003385cf716f1b88cc7753ca282f5493f204a2 ]

    fastrpc_invoke_ctx can have refcount of 2 in error path where
    rpmsg_send() fails to send invoke message. decrement the refcount
    properly in the error path to fix this leak.

    This also fixes below static checker warning:

    drivers/misc/fastrpc.c:990 fastrpc_internal_invoke()
    warn: 'ctx->refcount.refcount.ref.counter' not decremented on lines: 990.

    Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context")
    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lore.kernel.org/r/20200512110930.2550-1-srinivas.kandagatla@linaro.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/misc/fastrpc.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
    index ee3291f7e6156..3a5d2890fe2aa 100644
    --- a/drivers/misc/fastrpc.c
    +++ b/drivers/misc/fastrpc.c
    @@ -886,6 +886,7 @@ static int fastrpc_invoke_send(struct fastrpc_session_ctx *sctx,
    struct fastrpc_channel_ctx *cctx;
    struct fastrpc_user *fl = ctx->fl;
    struct fastrpc_msg *msg = &ctx->msg;
    + int ret;

    cctx = fl->cctx;
    msg->pid = fl->tgid;
    @@ -901,7 +902,13 @@ static int fastrpc_invoke_send(struct fastrpc_session_ctx *sctx,
    msg->size = roundup(ctx->msg_sz, PAGE_SIZE);
    fastrpc_context_get(ctx);

    - return rpmsg_send(cctx->rpdev->ept, (void *)msg, sizeof(*msg));
    + ret = rpmsg_send(cctx->rpdev->ept, (void *)msg, sizeof(*msg));
    +
    + if (ret)
    + fastrpc_context_put(ctx);
    +
    + return ret;
    +
    }

    static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:20    [W:4.350 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site