From patchwork Fri Oct 4 22:27:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 175252 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1307421ill; Fri, 4 Oct 2019 15:27:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqxADBLafUsofxFCs3wv0L61Lj0myEL2GoEy9V5B0uvQDE5yUuFIK8FTi17dhMweUTQQHso8 X-Received: by 2002:a17:906:eddb:: with SMTP id sb27mr14461291ejb.304.1570228053688; Fri, 04 Oct 2019 15:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570228053; cv=none; d=google.com; s=arc-20160816; b=ntXIELX4Fq9wGMUfObQV8tmTVBuAvO0qZVVVAz7s+en6DqaHc78UUUODMkONHY8Uz7 ATPoJMgSnLBq8eVlelhdB1QuGMluui/eqgmPvuYJilWsjpCUqFIJJlqRk6Ua4L4Q1Jtt s1XbTc6VoZ0lQ9wNsVDGYn7SC77GtnuV7tO58j9PWk2KbfuktWtmv7KrL6fFEiCS/UAz 0QawcfhY+jAzieK0DzvnosEw9XZ3TUIVoMyyvQ7o+l/zc27EUKRAnfYglrsY4flqGqIx GoAMgF7OugAy5g1OR24ZGxac5pUICm/Hl2f0rHPzden3LgaUEu6yXL0jgWyphmvg4GOb Ku0Q== 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=eTUNCaOOSGwA+ig+a2CKta3BFk73Lmp2ve0uszPOGFc=; b=OfL9U6zUIoli+LevcjK4Oc5ed+6fvSHSLT3KjLyqYrBvgKDpAXtVWF7a5pATqPDqbo 9zmzMiDeG0HbElqcE/jn+SJ59Qw6PZuyw2b5OR5BK5+5xM2q8mISAI5/y/m5RjBP2CWP N4zacjG9kPF9ikRvBKGRS9PMUtwFbRti0VZMzdEfNm64t8XWOzJYOP18WeguqBucMuUS Ns8U1D7bcHtVAlL5aUAE5r8+JAAh19DRAJJ2xRycr7WmS3WzlpiPGtJEP4DnXQqiDSGP wvJXlQFJvfPtD6tbjjhjPCrIAhLyRHKGIQg7e1LWCjTYtVQyTqu1NOSCKHx707Y/H3Zz ofjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=br7cGTb8; 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 k9si4463433edb.56.2019.10.04.15.27.33; Fri, 04 Oct 2019 15:27:33 -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=br7cGTb8; 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 S2388447AbfJDW1a (ORCPT + 14 others); Fri, 4 Oct 2019 18:27:30 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:39600 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388352AbfJDW1Q (ORCPT ); Fri, 4 Oct 2019 18:27:16 -0400 Received: by mail-pf1-f195.google.com with SMTP id v4so4733884pff.6 for ; Fri, 04 Oct 2019 15:27:14 -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=eTUNCaOOSGwA+ig+a2CKta3BFk73Lmp2ve0uszPOGFc=; b=br7cGTb8FH/qLzSnTzorqurt95SrUFywuFB5Jl8nSZ7AiRZhJKECx1dlOZkzMPQ2de TI1tjqQbCkW9EHXKfKG7xkzTJMC/7Qy6nJJL98/o+m//yicGc2lAl7axy70kmOlCuoAi 8y0cNXf8U+jYYxIync3074I2CzZAIS81DVyhRRzRBsFn4cqEQxUnAphdR9CKenTeBiKE Da76fC7/0+PavmPZSpvRvz7wGQHMcf15iQfAoREnVjNpN2syvrWojYJvp8kReVwph+HW wpiCnrI0daqKIORVVW6qp8rF8XZy1UwRNwB8jlmE2X4H7Yt3Ek4Z0i7WEHj6VSswUeki 7FSA== 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=eTUNCaOOSGwA+ig+a2CKta3BFk73Lmp2ve0uszPOGFc=; b=ZEG9EfBZuU372DiXsJRdYZOa0EnKRRHgCj2OcPHabEdFXxAfJTTV96yeYOAHeLZ7JA b1Wk8mppw/KrdV/Gwqi0qSBjFvFbUpLjhoDdlWl+jnkrMjsOabTTklSP0azqVQDwf0y9 qbq5my7zhaRIy+qks30Qk0giEA8xr8ba8PuHmK99tn6dSk2Ln7FPc/4MsdzAjzyE+X8v FdzDYkoK7mIS1Fil8eXtZkCY82zpIXqO/6SeaP+CDr/QKLwEGJqwTE2S7BW7XbEnEfd5 hlG85mF3/VMp9rtlu/RoawsW2pJ+W2URRUqTxExEOiyTQXeJ9hJzpXfVnpOCXSE0V64E 9m/Q== X-Gm-Message-State: APjAAAVjHCb8PNwNCeHTDoT91z7NUZC/S9zz+7gsmWK1SrB76/Gt9a5G Uxx6i0nM4geODMnM+xlJk29FvTeyzxQ= X-Received: by 2002:a17:90a:3847:: with SMTP id l7mr19708014pjf.118.1570228033776; Fri, 04 Oct 2019 15:27:13 -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 x37sm6328136pgl.18.2019.10.04.15.27.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Oct 2019 15:27:13 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v2 4/6] rpmsg: glink: Fix rpmsg_register_device err handling Date: Fri, 4 Oct 2019 15:27:00 -0700 Message-Id: <20191004222702.8632-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20191004222702.8632-1-bjorn.andersson@linaro.org> References: <20191004222702.8632-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 Tested-by: Srinivas Kandagatla Signed-off-by: Chris Lew Signed-off-by: Bjorn Andersson --- Changes since v1: - None 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);