From patchwork Sun Oct 20 01:57:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Goldsworthy X-Patchwork-Id: 11200529 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF2441390 for ; Sun, 20 Oct 2019 01:58:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBFDB21897 for ; Sun, 20 Oct 2019 01:58:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="DD35oYDz"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="I3cBTjqj"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="acbHJzaf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBFDB21897 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=ZlG8FHhu/IXXlYcp6Ge03xQDlWuIizOGfUCQ7Lm0RSE=; b=DD3 5oYDzEFNY9VxEwdaw+R6sgogw/cJgl6m9SNAeAGXBlYphI+pzhZiUbB1VpO7zBP3IrfOIICR8YJmp PDxVxHUdNXWD8ZzI4Y+nw14J/tzsoMX7Fw4zjBi9EBqlNyURxDAj903GEoZsIOvy+/FLBgzSTnbaN YOHlbE1rUQwZoT2ihFMcB82TfPn4aqa+GxzsgHQW+DPMnHm4xFPUuki4ah0pwYWjNenC7N+gnroTK 7KbCQmgTpTR9xIaaiXnNL0VKJRDx5DifuE2+uVwyR2B5PJoXgWguV2lYtEyJf7+bNiCdG03RIHmV4 ktuJY+VgR16XTBNjhNrCzbh3dGQj3fg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iM0UH-00054t-I2; Sun, 20 Oct 2019 01:58:29 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iM0UD-00054T-IR for linux-arm-kernel@lists.infradead.org; Sun, 20 Oct 2019 01:58:27 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 48FC160D39; Sun, 20 Oct 2019 01:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1571536701; bh=IA/2nenmpm2hIMv7OY+2bIdqFwYtpWLS+0Q+Q2dzqwI=; h=From:To:Cc:Subject:Date:From; b=I3cBTjqjSQ6vKw7eQRGCOEjvojj34FfnONu+JR0Q9l8L/SK5PCCFm2ZT0JPnZP5xR lI7p+1yBoAu5CJYnqLgwjjryDX37vs2k+w8GozJKEETRIOBfeuJcoXHFo83f1nccqp hYEJSlKni7OFMXmJ0iCOaQcjZ2EWGbv0X2c7HhB8= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED,SPF_NONE autolearn=no autolearn_force=no version=3.4.0 Received: from cgoldswo-linux.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: cgoldswo@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 4E1B760D38; Sun, 20 Oct 2019 01:58:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1571536700; bh=IA/2nenmpm2hIMv7OY+2bIdqFwYtpWLS+0Q+Q2dzqwI=; h=From:To:Cc:Subject:Date:From; b=acbHJzaf64weUMSWKM1saVt2iNwkt454/CYcxmxj/lbJsiEBmwBAR+kyg+WLr3EY2 0bRVZgBODmbcmyL6gQ8omKlltFaDfeiVFSNZrXrXBPyT/GhX2af3Cyygly/0Gjgslr K7koKWYlZL1Dls05rImMU/uYWdAG0FvfKYxPbOjs= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 4E1B760D38 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=cgoldswo@codeaurora.org From: Chris Goldsworthy To: robh+dt@kernel.org Subject: [PATCH] of: reserved_mem: add missing of_node_put() for proper ref-counting Date: Sat, 19 Oct 2019 18:57:24 -0700 Message-Id: <1571536644-13840-1-git-send-email-cgoldswo@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191019_185825_636482_283DE937 X-CRM114-Status: GOOD ( 12.27 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [198.145.29.96 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Chris Goldsworthy , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Commit d698a388146c ("of: reserved-memory: ignore disabled memory-region nodes") added an early return in of_reserved_mem_device_init_by_idx(), but didn't call of_node_put() on a device_node whose ref-count was incremented in the call to of_parse_phandle() preceding the early exit. Fixes: d698a388146c ("of: reserved-memory: ignore disabled memory-region nodes") Signed-off-by: Chris Goldsworthy To: Rob Herring Cc: devicetree@vger.kernel.org Cc: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Reviewed-by: Bjorn Andersson --- drivers/of/of_reserved_mem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 7989703..6bd610e 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -324,8 +324,10 @@ int of_reserved_mem_device_init_by_idx(struct device *dev, if (!target) return -ENODEV; - if (!of_device_is_available(target)) + if (!of_device_is_available(target)) { + of_node_put(target); return 0; + } rmem = __find_rmem(target); of_node_put(target);