From patchwork Tue Jun 23 19:50:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 191627 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp1377581ecs; Tue, 23 Jun 2020 14:44:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5VU6vKYF7TA1wHFFURWqf40hCm/K9c1c0BytpLCg8xdJdUhb4NVlcKzwhp1ih7A8Bd7re X-Received: by 2002:a17:906:1a59:: with SMTP id j25mr9448700ejf.398.1592948657139; Tue, 23 Jun 2020 14:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592948657; cv=none; d=google.com; s=arc-20160816; b=FfKFrQkm2ySl+8GCD6RRTqc0ktIamadHGkFkmmKqv/b4q1KrRFgGZc3MhI9irRKNiw nyf8BTROdSxBVeIcQ4Na56hJPLaHFUi5yl121skcZtNgJsr5X9qb0vW5L55XOgw3mvcK y4L2vviGoUd3VjS+EB6d58jm3lUgLK4sb9i5craNMRZBqESF39+7Z7nq4FT8PuiDTd20 RPcdiLrAfeJQviVXFaqrhf3gNQVgF/Cy1SlVbvLxL9E41mGGc5OZ/6AS/oJ/4MZdcoGm IuSVk4PxhJs06NGPi7jJuQsJz2DTBm0XXZogYq4uQxMxUrgNlSyjtmNTxxHP+L3zdXV6 N3Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+0L+ZfRZhpl4MsY6xHiXYfO27sTQtIDzZ/D6pr9y69I=; b=paIexcgUbdFS7GLa4YYGnRdhNhu3UyFQD8tvtKWPZDFDzzPDBsWp28umcx6wlakltW rL4VrsMJMr7JxizUNjSzPyy6jB6s96vB9ZsDwgzSMR48IHjyvF6gLDGJTOiPCzy0yvhu 2zjpAvRClnQv9gvxDKD3hFVoXASeWJfa5ak2IeOFyFo1l+k3rfS7OgONrOncIdi3NdJK mJ7PsIRDgOZExzVFpyPI+iMUwNs9XayXh0j8e4DrFlKzBzKjxkiaZs7NFQDODDMufH9O N324cjQuP9wlxi5WdMxAKC1rkLaneHtHAJBd64nU3OErOya5CYIQFdDSDbBUlo+rZxP9 zH2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CPnyg1Xh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h2si11392607ejp.405.2020.06.23.14.44.16; Tue, 23 Jun 2020 14:44:17 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=CPnyg1Xh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387914AbgFWVoL (ORCPT + 15 others); Tue, 23 Jun 2020 17:44:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:39928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387851AbgFWUCh (ORCPT ); Tue, 23 Jun 2020 16:02:37 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CA5AD2080C; Tue, 23 Jun 2020 20:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942556; bh=1Jo/vo4tTWbftNChB04q9LW+WzDhrX70cNawXmqn4AY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CPnyg1XhuepPnBrNfzqXlXd5ssa9qqqojhiysxcZ3EOKEEVgoTcXfccHzkLzt2GH3 6+PVPldAhOHyvnT1XEfD4jTZTuYOaa/sWkLEqNvxy4niQ6IdnZbJSIWxok4Khxw5zS cXqulKbo+QPXjRsoZkBWiKuuf5cloQOoJnBLG8Rw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Srinivas Kandagatla , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.7 045/477] misc: fastrpc: fix potential fastrpc_invoke_ctx leak Date: Tue, 23 Jun 2020 21:50:42 +0200 Message-Id: <20200623195409.736962970@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla [ 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 Signed-off-by: Srinivas Kandagatla Reviewed-by: Bjorn Andersson Link: https://lore.kernel.org/r/20200512110930.2550-1-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/misc/fastrpc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- 2.25.1 diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 9065d3e71ff76..7939c55daceb2 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -904,6 +904,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; @@ -919,7 +920,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,