Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp2253478ybg; Sun, 27 Oct 2019 14:27:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDVTqhCjLC8RmiPt6FzoVi2Rj8Z3+a30poqPndg2F28R0xIaMn4HkqUgVhkTv6tdx1dhas X-Received: by 2002:a17:906:9c1:: with SMTP id r1mr12195213eje.217.1572211675957; Sun, 27 Oct 2019 14:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572211675; cv=none; d=google.com; s=arc-20160816; b=W7+S24Viw9UdeUwfT9yGmxOlcYyyvgRWxRmUKylENXVCT5WjUwJcAZeN/xLdEuHY9Y sG49UFW1vLh2dbw1x90E4+BeryoWTlCiIGSHEL1x6R8q/TIXTVq6uHbcaCYErNuiuus+ jZkob7n8vDcJQhQR0wzZyKcje/nJOmahHScJsnRWr8080dd3I5Fb3RA9TEWFofTZODMy ylAxs9FnXJYympZ0GZ2Gg3beIQw4dSFZMqMwOwipeRTgYW0JnDhoRkKgbPuZyPjXP02U bfi9wJtqB7Pp/tK/dPBb/qCqgcvpeIhAyPt4QhxCj7JNEvharLqTPL/2r7YXYZN0tLdm jgNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oMCvrDitek+fxDr3z5HxcMXH+Gmr+juUgqJg+mCZoHA=; b=GX+tNJvukX3dD33E+6GMK2GWgefMQ5gLfHjp67vdkIMHv+AHUedpfkmJIE/tQ/dEa6 W6+LkfQxCTNfS/WWMBL4vksaxphS9SBKsCWTpAvMggdO47qJQ8I5OA3pTfaysgRVyO9I q/R5QPw274WGUw/hVlOuQLY5cn5hQBefQtPrpYH8hcj2r0rZsISqcWFB2Q2RVlagHnwb 5LlWejRHE038RMLPdVobuafq94y+0YuZZIFn5gSReFK9ZBo6UkGo1dzTOsC1JCl4YNqo R5SEFUt3zqZ30NXXaToTebIUc0QoFFV2DUwrZqkb4hFNwwyK1BupfJYoiRSocqFH5a6u LQJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IqpOG488; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h26si5990302edb.303.2019.10.27.14.27.32; Sun, 27 Oct 2019 14:27:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IqpOG488; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732849AbfJ0V0C (ORCPT + 99 others); Sun, 27 Oct 2019 17:26:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:47936 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732841AbfJ0V0A (ORCPT ); Sun, 27 Oct 2019 17:26:00 -0400 Received: from localhost (100.50.158.77.rev.sfr.net [77.158.50.100]) (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 BE41B21D80; Sun, 27 Oct 2019 21:25:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572211560; bh=ZxgU/YgKJ6fIPV5HOHALJbrAr0Tnr4KLl5w4qmP1CEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IqpOG4881ltMl+IxgQxVEtLhVgkpnyjPfy2Mogyh6NaCANHqp0+CPgDn90M8mg+6M aMmEZRRB4ZT+7sQPAG82bAiLNTqFHpcvyWlrNBgJlpn1NuxY7y9AfDCRPO78xRl9At F/BjKgW26Cj/bOePuxfhuYh7KYXEqpfWVZBGh0UY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Goldsworthy , Bjorn Andersson , Rob Herring Subject: [PATCH 5.3 195/197] of: reserved_mem: add missing of_node_put() for proper ref-counting Date: Sun, 27 Oct 2019 22:01:53 +0100 Message-Id: <20191027203407.014246162@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191027203351.684916567@linuxfoundation.org> References: <20191027203351.684916567@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Goldsworthy commit 5dba51754b04a941a1064f584e7a7f607df3f9bc upstream. 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 Cc: stable@vger.kernel.org Reviewed-by: Bjorn Andersson Signed-off-by: Rob Herring Signed-off-by: Greg Kroah-Hartman --- drivers/of/of_reserved_mem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- 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(s 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);