From patchwork Sun Sep 17 12:14:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 9954795 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 24B8F6028A for ; Sun, 17 Sep 2017 12:15:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 138FC28B21 for ; Sun, 17 Sep 2017 12:15:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0822728B27; Sun, 17 Sep 2017 12:15:38 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 A5A8C2897F for ; Sun, 17 Sep 2017 12:15:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750860AbdIQMOq (ORCPT ); Sun, 17 Sep 2017 08:14:46 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33908 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbdIQMOp (ORCPT ); Sun, 17 Sep 2017 08:14:45 -0400 Received: by mail-wm0-f67.google.com with SMTP id i131so6441381wma.1; Sun, 17 Sep 2017 05:14:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=K8myoS4sARyZbVc5V22sEs87HfPS9acaxY5XTwzKyBE=; b=M20k780mRdr0+/wQxIZ9f+nWXpVe3hAxBs3nt44j1o6iBXnFk6MitzSAzLqdZt3+uj 2FQWAcmDxki9j1WytArZT/ZPFh0l5VWQlVOL0kK6nd4hjfHYp/Xcpg6wREIAUibl9Zl7 yMItMmCNFV5FgIvkuKCljlLCKISWI9Axe9+AEZreKaj5Gcs6WIT1PwPGdShJAC6UXeqv SDythx98pPQwA1A8+QnNGcPG3IEThyEJ2QfAape/eu9MyifH8FQPYUsquk/G5HNg8Wt0 D2jucn0k6sYN0ALw5w+a9YonG1D0gofjTE7+xsBQIS/YIGoSoSNUxSnRTzSunYIOrdXm 9j2A== 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=K8myoS4sARyZbVc5V22sEs87HfPS9acaxY5XTwzKyBE=; b=owE52jd1z9hu+yoLqpjZCFR76Us8GxHz8Nr+eSCbdOKP+/T2bF7fQsqfpqAMW3lsZy KhLaYA6mK+9aHxwAJSvObfd+jfLv4AkRf4JpzXg13uiwD8dIH6E0SPgtTvSQ0ltSUCZe h72xg/TM9um3b+i33lzrv5nS//h/RV1siG+sf8RUB6lP7z6BuJuavPTdk8RlvW+nIy/e wFBsY83mbQEpx5iEdYszLECdFUhMdfjeCOWA8XV/0Pfl1nKSi4BgW5JUfw3pSby/YFVf toKA4KXgIE9fSiSfgICyjNJ6x9WqG40eo0Pt2UswFUxMMsoVn9Kvr5ymidwr3bddy4F1 rECw== X-Gm-Message-State: AHPjjUjQ5Rwj3gM+F/5F0CiO5D8VkUvV2iHx0rCBaVBRscYCVsNV/JmH S/NTDyKEGHgpVw== X-Google-Smtp-Source: AOwi7QBk6Om6IUruu1SiInBPHwXArnVgfapOSgT8vnrNwIFCwJfeOnfPU+t6WW8JMHsxs2cjFei8SA== X-Received: by 10.28.12.65 with SMTP id 62mr7410163wmm.129.1505650484321; Sun, 17 Sep 2017 05:14:44 -0700 (PDT) Received: from localhost.localdomain (cpc101300-bagu16-2-0-cust362.1-3.cable.virginm.net. [86.21.41.107]) by smtp.gmail.com with ESMTPSA id l11sm4649674wre.53.2017.09.17.05.14.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Sep 2017 05:14:43 -0700 (PDT) From: Sudip Mukherjee To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-kernel@vger.kernel.org, linux-remoteproc@vger.kernel.org, Sudip Mukherjee Subject: [PATCH] rpmsg: glink: fix memory leak Date: Sun, 17 Sep 2017 13:14:38 +0100 Message-Id: <1505650478-4638-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We missed freeing intent and intent->data on error conditions. Signed-off-by: Sudip Mukherjee --- drivers/rpmsg/qcom_glink_native.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 5a5e927..2e64c4d 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -640,13 +640,17 @@ qcom_glink_alloc_intent(struct qcom_glink *glink, return NULL; intent->data = kzalloc(size, GFP_KERNEL); - if (!intent->data) + if (!intent->data) { + kfree(intent); return NULL; + } spin_lock_irqsave(&channel->intent_lock, flags); ret = idr_alloc_cyclic(&channel->liids, intent, 1, -1, GFP_ATOMIC); if (ret < 0) { spin_unlock_irqrestore(&channel->intent_lock, flags); + kfree(intent->data); + kfree(intent); return NULL; } spin_unlock_irqrestore(&channel->intent_lock, flags);