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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 6FF60C47254 for ; Fri, 8 May 2020 12:56:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 476F524958 for ; Fri, 8 May 2020 12:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942614; bh=O5FR41JTbKq16AdmkKYLVI7ggdGMxpluv76/vMSoG50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=zv5EtJfyvxh+EZwy2OhxMSwGyOILiibGW0Fi4BJe2GBoFOrfI/LL2Dv9Mqfp7/t7m ZWz7Z9itXCdmXySox+ACXhVJOwmCsfP6ea7HXkL6n+YjYP1qNq8TAEhTzhpWPbZ5mV Plom1bngJ6EfKZ1GntxqCRz1uMEm3SlMhAvVmH4s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730423AbgEHM4P (ORCPT ); Fri, 8 May 2020 08:56:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:39620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730162AbgEHM4P (ORCPT ); Fri, 8 May 2020 08:56:15 -0400 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 627C7218AC; Fri, 8 May 2020 12:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942574; bh=O5FR41JTbKq16AdmkKYLVI7ggdGMxpluv76/vMSoG50=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M0/l1NSDxDO7Yz3wV1azycuAj/oyFK+4vXJLt5gLcmQdymM/DPgTVE+eGfiKJ8FAB PYPAcY6l2w71lhKJXjzSuG4r+YI0HK5xpVvHtLZKUXhSO16nNKyoQV3hihTTYa0dua PJ8Xqttq5P4AvBi1j3woyxka7bZ46+bM+AnPoM2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , Bjorn Andersson , Sasha Levin Subject: [PATCH 5.6 22/49] remoteproc: qcom_q6v5_mss: fix a bug in q6v5_probe() Date: Fri, 8 May 2020 14:35:39 +0200 Message-Id: <20200508123046.099775269@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123042.775047422@linuxfoundation.org> References: <20200508123042.775047422@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: Alex Elder [ Upstream commit 13c060b50a341dd60303e5264d12108b5747f200 ] If looking up the DT "firmware-name" property fails in q6v6_probe(), the function returns without freeing the remoteproc structure that has been allocated. Fix this by jumping to the free_rproc label, which takes care of this. Signed-off-by: Alex Elder Link: https://lore.kernel.org/r/20200403175005.17130-3-elder@linaro.org Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/remoteproc/qcom_q6v5_mss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 0b1d737b0e97d..8844fc56c5f6d 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c @@ -1607,7 +1607,7 @@ static int q6v5_probe(struct platform_device *pdev) ret = of_property_read_string_index(pdev->dev.of_node, "firmware-name", 1, &qproc->hexagon_mdt_image); if (ret < 0 && ret != -EINVAL) - return ret; + goto free_rproc; platform_set_drvdata(pdev, qproc); -- 2.20.1