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);