From patchwork Wed Sep 18 17:19:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 173984 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2731817ill; Wed, 18 Sep 2019 10:19:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0N/H8CHnxtkbV81gKQusM4ASXFEWIVe6F9lQzEL6+Wzey3FBKSDbj+WJ1C/fDOgwGUJg8 X-Received: by 2002:a17:906:82d3:: with SMTP id a19mr250151ejy.151.1568827165997; Wed, 18 Sep 2019 10:19:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568827165; cv=none; d=google.com; s=arc-20160816; b=jY8vsTeFC93T7eoXt8E1OFvlQLsx8N1oJltOsddxImUP+GCDfgs+bMhKNPQt6EYfuk KAzmCWMDuHGCmDaQYmbMggDO+YZooys1cb2/TGzQ+PSV9+a0xoEQm98HlsUEdHeLMS0x N+0S9jSbzi+XqHVCU3IJ0sTHRWY3oxwU+0ef/x6vupxKhAmfJ45wVTFca0uwKHJCEde0 pYlwJ7U4/w2cOqnI676VTMBOFPS4OTsiM0yJD5gWoSQYvEmfPYnDHezal/L0IKL5u3Pi Lizt/BA6K7fY17p3fCXqP4v/43ZAc8EzAZj2iCHKp6VRe2ojo8t5VycDj8A/Uxa0+f44 bD9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=KEWAXnlLjNC2nv8CVNynnjfMbw9zNY+Gb9tPaivirx0=; b=brYxIGms7jF20NAXx37P3TTgp81fTsBG+wko0pMUUUTS9SqGd02bFuhN5JSamclpdf wWppgmS7ppg/cElOSlGyZLYC+HrdrdxD0sQWbi41zjd8Zs5nINbY6ZRCFSaPwWanGNKt Po15cFnvRv7rnWEIHtf31VkRxzVQs+RmRibWwaYSCRFEyP6OWjnLpSQ4AnIuCtAmKJBW +63tR0m1i+Kw9Me/3VJnE/1rvnZqFlGlzGLQcxf3fVFMR+IIIu42ujyg4iK4IdqDC/y0 qFEMjt1R6SxGlQD7ihlpIlS7IZ/Xuw84fLLalthWE3ACQh7NvMAg0qUqmyZV2YwSMfX1 JzaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DrV6yqHP; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id om23si3416800ejb.194.2019.09.18.10.19.25; Wed, 18 Sep 2019 10:19:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DrV6yqHP; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732065AbfIRRTW (ORCPT + 14 others); Wed, 18 Sep 2019 13:19:22 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35933 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731322AbfIRRTV (ORCPT ); Wed, 18 Sep 2019 13:19:21 -0400 Received: by mail-pg1-f196.google.com with SMTP id m29so230555pgc.3 for ; Wed, 18 Sep 2019 10:19:21 -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:in-reply-to:references; bh=KEWAXnlLjNC2nv8CVNynnjfMbw9zNY+Gb9tPaivirx0=; b=DrV6yqHPlQC+6968RW8zY7OfYQOEud2XhRgMxa0V/FestL0ujwS6mS1ef4P3er4CFx YhWMA+vNLvjFQ9iRqdji403DJ31sUwHdAgCrOSEwodwZ4HEtgNUhTGAS9pYSYV8TsKK0 jX0niNN4fqvKG5a5c7wA5iv3Rq7IZrPBSkH7hHwIDgTMEZwsx73F0rBhsKqD2l9BGt4u FkEKnZs3m6FFnr/MH8qGU1wYzvI7h3XeonN6pg0R7tlNWSm6AndB+HnUKy2bw6F9aVcH qUKstThFhTPriRymtDqCK5s7H8ajExcPNAf7kUcTRQEW/LOdA7Q/T0i7oD3tOd1TPXC1 wDeQ== 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:in-reply-to :references; bh=KEWAXnlLjNC2nv8CVNynnjfMbw9zNY+Gb9tPaivirx0=; b=AJtkd1BE6EGaMnv18U9acJFO7Mhl2CrQO+mAlYAhMbaWaTKflWhk7Qi3Zp8+p6eQW6 Spw17V4G8OSfy6EGKoExMVx0aujqspd677hPu/53TlUMeKx4ebA7qL36eRyZxjO6LANj 7xet0ySHSvZK1AGt9X0+/vdzwoBkcU+got1ccrDjS1XVU/1WTGp5sr5B0kvh7Ufift3x gxkmx/QIm06dMCVsawnQiDFuHg2NZHY+WCrBJXRMJwvbfbMFYe5/02EEJRe+cO7o1Pdz Z0lbBIbMHg3RLLcGUjTwNtqWhau3qzCyX+xMavlMd8rOveEWkHSKGO4WDxTBbhlFuyfw 1MEg== X-Gm-Message-State: APjAAAUpM129QB9Mo2j7THfbtChKvlLSCUwmwWLdUkPzKsumXvIhekAp f9gD4GbFosegVp0FDfjxJ6A04A== X-Received: by 2002:a62:2b4d:: with SMTP id r74mr5507565pfr.30.1568827161136; Wed, 18 Sep 2019 10:19:21 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id y4sm2614981pjn.19.2019.09.18.10.19.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Sep 2019 10:19:20 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson , Srinivas Kandagatla , Jorge Ramirez Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/6] rpmsg: glink: Fix reuse intents memory leak issue Date: Wed, 18 Sep 2019 10:19:11 -0700 Message-Id: <20190918171916.4039-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190918171916.4039-1-bjorn.andersson@linaro.org> References: <20190918171916.4039-1-bjorn.andersson@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arun Kumar Neelakantam Memory allocated for re-usable intents are not freed during channel cleanup which causes memory leak in system. Check and free all re-usable memory to avoid memory leak. Fixes: 933b45da5d1d ("rpmsg: glink: Add support for TX intents") Cc: stable@vger.kernel.org Signed-off-by: Arun Kumar Neelakantam Reported-by: Srinivas Kandagatla Signed-off-by: Bjorn Andersson --- drivers/rpmsg/qcom_glink_native.c | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.18.0 diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 621f1afd4d6b..9355ce26fd98 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -241,10 +241,19 @@ static void qcom_glink_channel_release(struct kref *ref) { struct glink_channel *channel = container_of(ref, struct glink_channel, refcount); + struct glink_core_rx_intent *tmp; unsigned long flags; + int iid; spin_lock_irqsave(&channel->intent_lock, flags); + idr_for_each_entry(&channel->liids, tmp, iid) { + kfree(tmp->data); + kfree(tmp); + } idr_destroy(&channel->liids); + + idr_for_each_entry(&channel->riids, tmp, iid) + kfree(tmp); idr_destroy(&channel->riids); spin_unlock_irqrestore(&channel->intent_lock, flags); From patchwork Wed Sep 18 17:19:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 173985 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2731840ill; Wed, 18 Sep 2019 10:19:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqzUQaRsRmYtinEVjHA9D9qflk960FoGiVGi/zr+D1DNrUmAcybhufh3qcwjdP1PKncxqSYR X-Received: by 2002:a50:cf0d:: with SMTP id c13mr11384940edk.125.1568827167345; Wed, 18 Sep 2019 10:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568827167; cv=none; d=google.com; s=arc-20160816; b=QDAijPBBQSO9X4ZfVqA3y6bZlRYqUmO3OAfqLF66iS/VZcPg5xDK+XD3S5xIpAyvBL ldnFakr16b8hhPFtVmhdb/9RK5k6RHqdMRQVHaAAKO/92bMFsYf2MNkjoOcJSKi+I+r9 P1gZUwzmIEHGgKHs826GrriG4cGq/dEEq1q3KDG7nvGB1KMOFuso4qes7mh7iR4Z9N2w Ru/EPk76nj+yBqA7EDBwahfZBZqvJWVjaU3tqsJ2neEZKn8Plkrti+KuHVAQVBtepKwi vY64xpE812GLF4TcC8Hjhnkge8nRtd3/CdtC1k96JQSIKUs1mEjnCNrmvuesl8NJ7lBM inJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=j0roT+o44pSB3MM7mlqj6crjaHtjbvUFCdPy0FOZOMU=; b=Qc8yHfjg5n2L1PgxTRD0pcyZBVEtZIXw4vAH2GKqs5lKdUr3Q3fpKbmElpNBsZ6/Du OVwpy7Kg9dpWam/L/Yp+jLoCfmCSKaFAN9n5cuEAbFpbhVWtvyHxveBVNYXuzXcH9/ms ALO5ZXIbAtGBwFntu1hlh+0kq7lBYewFlgSzGn1noKszm/JwZiq4UwHN7Y1ZQBfqmmC/ IGySLaBV2HebYobQvV4+H/VONNONBKxPCcE1Db+NNCSKJ0Skw/yzR7FOCFZnSE7oAB7J akUbXRLKWD3u8SRzf+dNC6mV4hlqyjRjWoF4crfcAbc0YFOXz5ohq2Y5IvFaDjb/pqjA tDqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O4JEUjWN; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id om23si3416800ejb.194.2019.09.18.10.19.27; Wed, 18 Sep 2019 10:19:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O4JEUjWN; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732100AbfIRRTX (ORCPT + 14 others); Wed, 18 Sep 2019 13:19:23 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:39131 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732099AbfIRRTX (ORCPT ); Wed, 18 Sep 2019 13:19:23 -0400 Received: by mail-pg1-f195.google.com with SMTP id u17so219208pgi.6 for ; Wed, 18 Sep 2019 10:19:22 -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:in-reply-to:references; bh=j0roT+o44pSB3MM7mlqj6crjaHtjbvUFCdPy0FOZOMU=; b=O4JEUjWNfJnoTHf3Kz89DjXTVO8W5+rzHM+ls2mRU28W2FV8b8nZpi6L4cqrkJ3F9M YNXjD36ZsIeuhFahMECAXywua8oqYrxpt1YatcxAwxFJK9o8yNXSuTbqI2vXKYbh9p6N m6cO55tIKUoEWfQv6zUtFnHHhSEaHEkcJ9GU5jj8LdOugJZpZqqSyw4shaBwj57pe2vE d4kyc4biEk89OMh2r0LCFn+HzKVVH0MLLffXz+uCuT8rhq7ATBdYujE5awZYqY1PKdfZ ZdaThZ6464sjkSOeHGmwdi2hbFJGRoV9AsQs0ByhiPZzcpKm6rrL7HIXmoiFAxGyDUqs bklQ== 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:in-reply-to :references; bh=j0roT+o44pSB3MM7mlqj6crjaHtjbvUFCdPy0FOZOMU=; b=jJMkOefPGwNBMakgSBT06K4BJuWVcRJ1jdKNeyWmm0e5dx+1nhTjXUn1jloyPkg6yU Op+NXUZjFqkHL15aGQdu/TWMXbCvY995wqpbFDU7MoSms6hlZhOKtcMH0y5Vodb0RJGa zdTvSA74PgcXH730pMF+WiM3xIPvbcteIyZX3vShd6UjWxPNsgtd83wod8O5VH3OnjQu G/LB5jLUM1qQRwbFJTLIBmpDXVsYpOxEgAlCHpNxAsEHYxmEYjsIoP3Hp0M9BDz4KWeX Ggb2+/ioDUv0FSR0KQS4j6wrmsW6Di5HzperWq2xj+GLuGqc/f84KLcjLD0mcZimnkbB i2/Q== X-Gm-Message-State: APjAAAUyKzH1LsW+wF3I3/XviuTQTtqiIT7F4DcOq9saHUyGig8iSU+M mHTWG59ruaJYo3Hk/JB7xqzGKQ== X-Received: by 2002:aa7:9216:: with SMTP id 22mr5574508pfo.214.1568827162439; Wed, 18 Sep 2019 10:19:22 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id y4sm2614981pjn.19.2019.09.18.10.19.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Sep 2019 10:19:21 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson , Srinivas Kandagatla , Jorge Ramirez Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/6] rpmsg: glink: Fix use after free in open_ack TIMEOUT case Date: Wed, 18 Sep 2019 10:19:12 -0700 Message-Id: <20190918171916.4039-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190918171916.4039-1-bjorn.andersson@linaro.org> References: <20190918171916.4039-1-bjorn.andersson@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arun Kumar Neelakantam Extra channel reference put when remote sending OPEN_ACK after timeout causes use-after-free while handling next remote CLOSE command. Remove extra reference put in timeout case to avoid use-after-free. Fixes: b4f8e52b89f6 ("rpmsg: Introduce Qualcomm RPM glink driver") Cc: stable@vger.kernel.org Signed-off-by: Arun Kumar Neelakantam Signed-off-by: Bjorn Andersson --- drivers/rpmsg/qcom_glink_native.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.18.0 diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 9355ce26fd98..72ed671f5dcd 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1103,13 +1103,12 @@ static int qcom_glink_create_remote(struct qcom_glink *glink, close_link: /* * Send a close request to "undo" our open-ack. The close-ack will - * release the last reference. + * release qcom_glink_send_open_req() reference and the last reference + * will be relesed after receiving remote_close or transport unregister + * by calling qcom_glink_native_remove(). */ qcom_glink_send_close_req(glink, channel); - /* Release qcom_glink_send_open_req() reference */ - kref_put(&channel->refcount, qcom_glink_channel_release); - return ret; } From patchwork Wed Sep 18 17:19:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 173987 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2731902ill; Wed, 18 Sep 2019 10:19:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqzI+dgzzcYdsdFTiKByMkcwzMWHqVjQc8QsTME4iTSwP2fwgjkPayJ6nekaOdS6qeR693yL X-Received: by 2002:a17:906:5c52:: with SMTP id c18mr10637940ejr.156.1568827169976; Wed, 18 Sep 2019 10:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568827169; cv=none; d=google.com; s=arc-20160816; b=KJOkurMi8mh3g0mgsQkD93L/QHS2+DLBotfHCcItV9RjgUKAwXr5ZoraTSyDfh7ifK QQVejij6ptnsTv4R/YJEQ9oVkRhWORWjtzCFvOOSYFUADUNkkW3zR3sM7JvAIc6bW3Em 3VBk9CKJC+8PWn2O1BNqSAdHkmXAZZGD+fxpJVTCVDejh0laBmAjppZiJI+8Fec4lzGc OO9Q9y5fvma1R0+qYNRAvWFmx8+MZHKvdtcaoNek4c9745sog5jwm4aNZNMLMOolGnA1 Gd40dHHoAZeJiungnhKEkQ3rcp4FhazOmmwJX2La2LA80JoJC+F13W9AdJuDFFOztGe0 D8Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=0Uy6bHHevUENAulkqSQtPk+BZ1l0ipc3uMDtQFYz2nQ=; b=ucfg1SN33ZvBMt6CAkxTpTaQRhp6iTE+Wslsi9GvhC+uMHp/Gq7dvIdMC+tenJJenh ouKP4V+9jsdYsOv0v1OmKCOZOl5sKn8u1nQRv2gFzjddxrSwuyPQ1uy9O/2SPKEaNHq6 a1MpUgFOVryCfwP18H3N71d2oeCZgxxBr8lWB0T67e48rPeKoR+ebVNFOVsLZlBW02yA o6myliQxD/DTFWssBGvDX932fLL6k8N2D1INCmwdCyoEzLJxhy8ukFM4nknikpdtbku0 YfAfEq465fTzm4aPRNA7sbW1TGnigJT3ZVfdRaXgBOlmyxNPD/kN4r7YRMlef3VRT4cA 1FUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fUltYfIH; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id om23si3416800ejb.194.2019.09.18.10.19.29; Wed, 18 Sep 2019 10:19:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fUltYfIH; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732126AbfIRRT1 (ORCPT + 14 others); Wed, 18 Sep 2019 13:19:27 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:36196 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732121AbfIRRT0 (ORCPT ); Wed, 18 Sep 2019 13:19:26 -0400 Received: by mail-pf1-f193.google.com with SMTP id y22so426310pfr.3 for ; Wed, 18 Sep 2019 10:19:25 -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:in-reply-to:references; bh=0Uy6bHHevUENAulkqSQtPk+BZ1l0ipc3uMDtQFYz2nQ=; b=fUltYfIHMIOjnGd1FS6BZiNa/6sr2uKEIzz7Km04e6IE93VkMueUYltt3JEHNNMed1 GQRuxifsOhM9iy6QFfjHwj5jaUiX3QsJHwCb9hKSyT0mAeqdcDs9/ajmOcMrgjTnntfh MuRVkkBgPraBP+jhxCtecPZoou+N86UCV+33hwtlyvZfuoOtA0EbncL9o39XLbqVd6I9 3Kg49BtFHgGwGEp4UMyN1ypdjImD87vMg/gWcEbN4c7Q86aX4C3vTbB5HbKi9hjaqPtq 2h1Yj5ChS0HnM9jwMmeHYwddXhW14mb+g0jXmXjUb2lJQQov7Qcyp0X7vLD0dfDJ7xdN fnhA== 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:in-reply-to :references; bh=0Uy6bHHevUENAulkqSQtPk+BZ1l0ipc3uMDtQFYz2nQ=; b=b7CQsvgpZGeGuFLyS2Z8Mme7Ry5Z21fH1dLxN23rmL1EXNIwntqCg+hCFL63BYQgaH oj3T+bRNKIBG8+JObTd0qTJph19bTi/ESvth2DhywIFqVUy89wPHNxGeoU216mDsfRBw 96/VJn1lLyx8E1WVsLNOQg29tR9TQdJ0JtWrsD2pdVGYY7eO6CUHVItNiQwspJazHmml KE79x9zc8ly1htHdTXDa87WHh7LiAraOJhAqffvB+BmINCuYwr3/6YOy4ery0EjwlRko s+Q17g9JNi3UXVi8tSg/5tYUgjtTsgZ/QBglV2shxwvNEql86LEMyHpdxM17i9n7OSM4 KOYw== X-Gm-Message-State: APjAAAXX4eavKXSdosd2BCuNUmbVfAwXUVVZrlTWcHbQwMiRy7m2N2+q JQaxPwhMzTlavZzvZbwH6v/NyA== X-Received: by 2002:a62:db84:: with SMTP id f126mr5532642pfg.25.1568827165043; Wed, 18 Sep 2019 10:19:25 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id y4sm2614981pjn.19.2019.09.18.10.19.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Sep 2019 10:19:24 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson , Srinivas Kandagatla , Jorge Ramirez Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 4/6] rpmsg: glink: Fix rpmsg_register_device err handling Date: Wed, 18 Sep 2019 10:19:14 -0700 Message-Id: <20190918171916.4039-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190918171916.4039-1-bjorn.andersson@linaro.org> References: <20190918171916.4039-1-bjorn.andersson@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chris Lew The device release function is set before registering with rpmsg. If rpmsg registration fails, the framework will call device_put(), which invokes the release function. The channel create logic does not need to free rpdev if rpmsg_register_device() fails and release is called. Fixes: b4f8e52b89f6 ("rpmsg: Introduce Qualcomm RPM glink driver") Cc: stable@vger.kernel.org Signed-off-by: Chris Lew Signed-off-by: Bjorn Andersson --- drivers/rpmsg/qcom_glink_native.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- 2.18.0 diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 21fd2ae5f7f1..89e02baea2d0 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1423,15 +1423,13 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, ret = rpmsg_register_device(rpdev); if (ret) - goto free_rpdev; + goto rcid_remove; channel->rpdev = rpdev; } return 0; -free_rpdev: - kfree(rpdev); rcid_remove: spin_lock_irqsave(&glink->idr_lock, flags); idr_remove(&glink->rcids, channel->rcid);