From patchwork Mon Mar 20 22:18:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 72510 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp1473270wrt; Mon, 20 Mar 2023 15:41:43 -0700 (PDT) X-Google-Smtp-Source: AK7set/cUS3aNDLkxq8bgxfdQHifpWRqyBm2RgcGl2dpAC2eqDh9aQcYfK2tX7mG2afvIKRTBTxF X-Received: by 2002:a17:902:fa8b:b0:1a1:bcf:db5f with SMTP id lc11-20020a170902fa8b00b001a10bcfdb5fmr31819plb.25.1679352103261; Mon, 20 Mar 2023 15:41:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679352103; cv=none; d=google.com; s=arc-20160816; b=tde6+2pjf4y+vLtTLv2sc+mgb/rzfkpTYIWY8HoRX2vwi6mDOo2ybolL3+Pyl8iR1X IQlDpTRi7a+Vv7P0mLHP3HZmnC12PeIoAxdZUjAsuytoEDUxnaBFbhmBseUErBZSFZbc cs5ysgklbKEik0jjbx/w0yJ9KoQdNyximiQ6zW1EkgejmqKqRxZQtFea9OuhsPct1CvT tV02oNaHIlQW6l4TfXbkCMw9O+EI4ZA6kF57JeW0OzhzpNpfyJM2QbSA2Y9f6kuYbGpU x9dNxpUQjPcVyk2uWea6urzptbRhs4+Sq0kzoT+g2lhXVIdJwcK6XI2h4PYlnb7AxqON gu5w== 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=trrnan71ZHM7JKq0ql81PKKI2hb7rlyx27+ksKXBUrc=; b=b4XwtduzDfHcC4Zkgp+FbnErjWYQDzjsbgI/8GyBXTkqlyKb8LWy5dOu+PF9Rgg4FS lClGp6YW3VEb6srCgvyzN0I+bhEb037cfox9G/H8+7b6xesKC7Nnh1abQTRiJYcSO6Ca BVA/qw2AP0TaAHlx9eVu2Y7udVjTfUYVjOjc6yM+IfU/r1ZMYx1XAEw6SF8Z3L9PRRhR tiPh33aaw+LUnKp2Occ99JiaPRGNUzPC0BNplJRwZTUMFzi5Fb4NxvyzPWPNrDBjMhyH ol0tp95zNkwp2qlr4O6Yj0lIH0a4zh0pDESYIMb/9mIJ4OOCgQo5iBCK/qO3M8waYDoE hLqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f8qUTKDD; 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 t12-20020a170902b20c00b00189c05664e8si11202125plr.563.2023.03.20.15.41.31; Mon, 20 Mar 2023 15:41:43 -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=f8qUTKDD; 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 S229987AbjCTWUw (ORCPT + 99 others); Mon, 20 Mar 2023 18:20:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229705AbjCTWUY (ORCPT ); Mon, 20 Mar 2023 18:20:24 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F00B9193D2 for ; Mon, 20 Mar 2023 15:18:44 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id i15so3858749pfo.8 for ; Mon, 20 Mar 2023 15:18:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1679350716; 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=trrnan71ZHM7JKq0ql81PKKI2hb7rlyx27+ksKXBUrc=; b=f8qUTKDDglZJsgtv/KBhPEPSfsS/rDPVt7Q0ZvXfNE706If1SqJBI8NpCJq27Qo5gT DBGx99X/V+1V/tiTX54m6jRBxlszJZzogDlJCJTGTGIyxt6vbGwLhOM5KJqI9t04HNkL UQiy8VgJ1YxaLJ3QEbxjNGfDTUEzgR0koUy8jLa9VneY6PVluLfJvDPrLj+7E6CzK8OX MpFui5oS0O1cN+E/S3R2STlDyC4eSSr8INCk6CUcgeEVacgLh7uNNFy5QH/uMOp4VMzI m7UzrJVNthCu6l1D+R4JkUqPMcVo8xeHkhGJsyPEFhnBp5JUuQoLnCg4BemhWRypa75W GIHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679350716; 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=trrnan71ZHM7JKq0ql81PKKI2hb7rlyx27+ksKXBUrc=; b=gW3fWNJ3z2h7846DU+bQWUki+wg3Wr0UWSExWqZL7FmjH3+7/VGTcG8h/07u1RsKS0 7PmuwTbNnScDSczBt49seaNmStCXSU348dRxMszE7UlbgWOlkZGP4hwNUOs5NYkonSLP aCr1etCFJ4nx+FQWzx+konCZcCjqAnJgyammEr2itNXA3Rl2uAKiLZB/EfYg3t/Y08aD 4vplbZzc6eLBRNzBFtNztqGZeh9s8am35mxqWfHNq1w1kjo3bDhd9NKkHq4pImpK45t3 A4MNT8eR24N6lV9jiiXcQYawypYIGlLC3Ul6pLvAYLqbCsW4gnnVxHnVwyI+OUrpT/Ol Nghg== X-Gm-Message-State: AO0yUKVTjRZMzFGM6AImChuwm6lfTQ+KLTkTNfGUL0ZZupSyYv7BcYv5 zlX/HZ/xaZ7QH3ztQPmzQbF/Ug== X-Received: by 2002:aa7:9ae5:0:b0:627:fb1c:3af4 with SMTP id y5-20020aa79ae5000000b00627fb1c3af4mr342235pfp.21.1679350715864; Mon, 20 Mar 2023 15:18:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 15:18:35 -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 4/5] remoteproc: imx_rproc: Call of_node_put() on iteration error Date: Mon, 20 Mar 2023 16:18:25 -0600 Message-Id: <20230320221826.2728078-5-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=unavailable 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?1760928310745278509?= X-GMAIL-MSGID: =?utf-8?q?1760928310745278509?= 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: b29b4249f8f0 ("remoteproc: imx_rproc: add i.MX specific parse fw hook") Cc: stable@vger.kernel.org Signed-off-by: Mathieu Poirier Reviewed-by: Peng Fan --- drivers/remoteproc/imx_rproc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c index 9fc978e0393c..0ab840dc7e97 100644 --- a/drivers/remoteproc/imx_rproc.c +++ b/drivers/remoteproc/imx_rproc.c @@ -541,6 +541,7 @@ static int imx_rproc_prepare(struct rproc *rproc) rmem = of_reserved_mem_lookup(it.node); if (!rmem) { + of_node_put(it.node); dev_err(priv->dev, "unable to acquire memory-region\n"); return -EINVAL; } @@ -553,10 +554,12 @@ static int imx_rproc_prepare(struct rproc *rproc) imx_rproc_mem_alloc, imx_rproc_mem_release, it.node->name); - if (mem) + if (mem) { rproc_coredump_add_segment(rproc, da, rmem->size); - else + } else { + of_node_put(it.node); return -ENOMEM; + } rproc_add_carveout(rproc, mem); }