From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76041C2D0C1 for ; Thu, 19 Dec 2019 18:50:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4B20124684 for ; Thu, 19 Dec 2019 18:50:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781450; bh=6MqNxT771e5iNqvtYepu1DYQ5t3AO30nbKy/IdKyuVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iWumtaiVK3vcmtrR3511e3GB27VlJfKBlsPV5LeysuvcSDCWDnzCVK/8tAnl2XkUs JOS2ze5BjZ63k/nbEkoFPe0m5X7BVzEzkuWhFmlom/OMwXVD/rKUBB2+bVfkVzOJsv 4mE479QnQS82VAlPzHB+uYYKAXmp+GqvRKxODBZE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729556AbfLSSup (ORCPT ); Thu, 19 Dec 2019 13:50:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:44612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730017AbfLSSul (ORCPT ); Thu, 19 Dec 2019 13:50:41 -0500 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 A4BD924679; Thu, 19 Dec 2019 18:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781440; bh=6MqNxT771e5iNqvtYepu1DYQ5t3AO30nbKy/IdKyuVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=akfw13M4GvimURxnmBD0Z4KwZYcU9tLn2fQn5WhBgRckbkiPEgG5A0WML6a5iT92K Q5B8YB6MjwVL0vE4fkn4yxnIA9on/ZmOJnpIYidxX+ez8P14bzO/Gd7MirbvUuQ/i1 kPRsNexJ8IWqNpJC0olUr9jbj4PCtBQQ5HjJIRXs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Chris Lew , Bjorn Andersson Subject: [PATCH 4.14 23/36] rpmsg: glink: Fix rpmsg_register_device err handling Date: Thu, 19 Dec 2019 19:34:40 +0100 Message-Id: <20191219182913.664143063@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219182848.708141124@linuxfoundation.org> References: <20191219182848.708141124@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chris Lew commit f7e714988edaffe6ac578318e99501149b067ba0 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/rpmsg/qcom_glink_native.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c @@ -1400,15 +1400,13 @@ static int qcom_glink_rx_open(struct qco 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);