From patchwork Mon Mar 20 22:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 72513 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1474451wrt; Mon, 20 Mar 2023 15:46:03 -0700 (PDT) X-Google-Smtp-Source: AK7set8FT3l2Di3psDi4srOuFgiMiEVQzK9fP5Nrsm8KIxQJn51QZM/QlF7+KU3r/toScDt6YYWa X-Received: by 2002:a62:1954:0:b0:628:9b4:a6a3 with SMTP id 81-20020a621954000000b0062809b4a6a3mr972841pfz.2.1679352363482; Mon, 20 Mar 2023 15:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679352363; cv=none; d=google.com; s=arc-20160816; b=PLtPKO09vSqKRcvenHDIAT5e4qCSCejFM05qBQS+tcaZyy+ClHTRvYKfuMpfSGA/EK Y98XlivNdFUVn9qhJ0AVbxeRXiaMgyPzJSnRwyLy40SQ3HpXSxPlSgrmzrUmWPufLtx4 X6RLxoXEzfpwroVJcQeIg0WJrMFzqjNFxy+o/CNPoJXEjqiY62r14Iam+zb2daSajt9u Zpko/K5fnWc00DuWyJBhXRMEm078LCLQGYcfQJk9+L5ytHRJu+6avWkCEYEYBEG1/E9o 1E+M4/dKI3dZajOu0OKZ5jdP26YmmZAd4ODOw+1lSwDhxvc+clVMGY3h/70ilgwepMLo 8XCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7SvawGG1lzE2m2LYlYl0Sje5AT1/P8cyqdj5Tvo8pXw=; b=aMcv/IzJQyusvtm9EBtLgH7j4EJYlEkZSFjtpYfwwojdK4ov7gvklkeJsVvbpeSEEF vRrEDIjKUyqcojfBrHNjExXjHqMj8Bgb1Rk1dMca0xJUZRx8LC0UchIe7nltNtcxEHve oNwTxtGLXALb1BfWjn7JWt+jQO6PGAEEPa0wRHy9Etl1dKtmJ3yDj4pKtIN6hkoW951r 9Xnr615yxL8DuVW5c8seFR3Ayt+Uh+IDAKk38E+Bp6imhAQMZT8OLXEYzN2EbYYAay5x PVoCkUCWHAEPFqmzlAXhxFOfF2Uge82gLX7GuYNEtuSQn1xg8brZUI9LFK9cjVtk56CH R/Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PvsJCIxu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p7-20020a056a000a0700b005a8b856ad4csi12149818pfh.205.2023.03.20.15.45.51; Mon, 20 Mar 2023 15:46:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PvsJCIxu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S229968AbjCTWUo (ORCPT + 99 others); Mon, 20 Mar 2023 18:20:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbjCTWUW (ORCPT ); Mon, 20 Mar 2023 18:20:22 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D6F418145 for ; Mon, 20 Mar 2023 15:18:38 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id s19so2188283pgi.0 for ; Mon, 20 Mar 2023 15:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679350714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7SvawGG1lzE2m2LYlYl0Sje5AT1/P8cyqdj5Tvo8pXw=; b=PvsJCIxu/xbvlnlhZcbf+hp2aL49LnhKhuTqbalsm2KYp8FtnY4tziFYeq6PECIzcv 7wi6KhU0/ObSDhiFpGp54opvLN9aTw9Wxivakpea5e66Hp5jxFO8z+vOmDN3Y7UHzaR4 e8Zqc9Dn4od77y53Ps62VFI3Fqiz+C08ZRcMRPROfAa6acetGE+EqDK7pMA1L8lJsPE0 fLoMHZufOKtY2UmiwA4oBVPyFh20qPih0+Trtn9bP3JI3L/v4pvBKGd6iINDctJAwTdt 2wGNlFYVcKYBKwuhOu7maadGhWXFYBS9hWhBMXS9gXFGIq16h8VrJ3kYtrTXyx5cZtsD 6sYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679350714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7SvawGG1lzE2m2LYlYl0Sje5AT1/P8cyqdj5Tvo8pXw=; b=M0Rjy+kT7BX+XiJUJy/MfnfLXCMWi+e5nc2FLKwQTH1rfYF/jb7ORubJj9pabomS4+ vFNps8W7KAp8fyH9ZquHemFwKeJDO6rHUTVnSnitAsrzcO6EE4aGR9uwCeMVvQg7sSxd rsbSe1Vi3Stq6xTK0VlHzZdt9J+UU1kAKCGtnWDPcPv60RAgJbxe2FhkLJvSeBR4w0us uNj8mI7IwoXWS1JKlKc3yPIXoBkSW44j5BryGo0k7+Yo8OdFMl7aFfowKUMMg7nyNPZO bWZy2ybGzDi5fnnwOjc8fuk7NI3T7TEEztpwaA3Je2yIVGDi8capiT8y8ilsMhj2wpDs /jVw== X-Gm-Message-State: AO0yUKXZo/4cT8ZOQMX+X9ccWtIKLwJmVEyKyZM/98qPWYiIcqRhhLzw lfM1O6saVzh6x1TNC7lmJWm04g== X-Received: by 2002:aa7:8614:0:b0:626:22e5:beb8 with SMTP id p20-20020aa78614000000b0062622e5beb8mr11549651pfn.3.1679350713845; Mon, 20 Mar 2023 15:18:33 -0700 (PDT) Received: from p14s.cg.shawcable.net ([2604:3d09:148c:c800:4ab5:5131:bafc:4428]) by smtp.gmail.com with ESMTPSA id e15-20020a62aa0f000000b006259e883ee9sm4459196pff.189.2023.03.20.15.18.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 15:18:33 -0700 (PDT) From: Mathieu Poirier To: andersson@kernel.org Cc: shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, patrice.chotard@foss.st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, arnaud.pouliquen@st.com, hongxing.zhu@nxp.com, peng.fan@nxp.com, shengjiu.wang@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] remoteproc: rcar_rproc: Call of_node_put() on iteration error Date: Mon, 20 Mar 2023 16:18:24 -0600 Message-Id: <20230320221826.2728078-4-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230320221826.2728078-1-mathieu.poirier@linaro.org> References: <20230320221826.2728078-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760928583886992160?= X-GMAIL-MSGID: =?utf-8?q?1760928583886992160?= Function of_phandle_iterator_next() calls of_node_put() on the last device_node it iterated over, but when the loop exits prematurely it has to be called explicitly. Fixes: 285892a74f13 ("remoteproc: Add Renesas rcar driver") Cc: stable@vger.kernel.org Signed-off-by: Mathieu Poirier --- drivers/remoteproc/rcar_rproc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rproc.c index aa86154109c7..1ff2a73ade90 100644 --- a/drivers/remoteproc/rcar_rproc.c +++ b/drivers/remoteproc/rcar_rproc.c @@ -62,13 +62,16 @@ static int rcar_rproc_prepare(struct rproc *rproc) rmem = of_reserved_mem_lookup(it.node); if (!rmem) { + of_node_put(it.node); dev_err(&rproc->dev, "unable to acquire memory-region\n"); return -EINVAL; } - if (rmem->base > U32_MAX) + if (rmem->base > U32_MAX) { + of_node_put(it.node); return -EINVAL; + } /* No need to translate pa to da, R-Car use same map */ da = rmem->base; @@ -79,8 +82,10 @@ static int rcar_rproc_prepare(struct rproc *rproc) rcar_rproc_mem_release, it.node->name); - if (!mem) + if (!mem) { + of_node_put(it.node); return -ENOMEM; + } rproc_add_carveout(rproc, mem); }