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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 8F33AC31E4B for ; Fri, 14 Jun 2019 20:38:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5894E2084D for ; Fri, 14 Jun 2019 20:38:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544726; bh=mviNZkUOj5d7dJprZYjsl+zsMc9FLFgp6LYFtzTF3J4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2wVxwV/Gv2Gr39ALPW1lWlpqu6e0bmcXCLAq10nTbqM6RTHjIwkQSPVnGqFQ8JG+f rt8/PvsiKaF+S7QHCMXYvWsdYH9QCSLUXLJxI04ouImHXA7OP06mYca4RmY2Wsgg0V oituNOC2RthFYFaPYFzX62DfeSAXj6E9PhxWX+do= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726659AbfFNU3A (ORCPT ); Fri, 14 Jun 2019 16:29:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:50684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726626AbfFNU27 (ORCPT ); Fri, 14 Jun 2019 16:28:59 -0400 Received: from sasha-vm.mshome.net (unknown [131.107.159.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9E7D62184C; Fri, 14 Jun 2019 20:28:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544138; bh=mviNZkUOj5d7dJprZYjsl+zsMc9FLFgp6LYFtzTF3J4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mip8Lu5nbXp9W4wHyXBDTDDEcfpj9vZ5S5odIoJA+iIWZop4FwkPTsD080JRZ8R2G X4r+s7JsX6PvYghT0L3C6MthbMzECORQ5FGIJDThJ/ahiKAXOQwfuYl7AAcdz/GTOB VbMpOI4FtdgM6xrSlKfykPkYAWKGUwhiH4ahrSlw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wen Yang , Alan Tull , Moritz Fischer , Nicolas Saenz Julienne , linux-fpga@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 5.1 14/59] fpga: stratix10-soc: fix use-after-free on s10_init() Date: Fri, 14 Jun 2019 16:27:58 -0400 Message-Id: <20190614202843.26941-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614202843.26941-1-sashal@kernel.org> References: <20190614202843.26941-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wen Yang [ Upstream commit f5dd87326fefe42a4b1a4b1a1a695060c33a88d6 ] The refcount of fw_np has already been decreased by of_find_matching_node() so it shouldn't be used anymore. This patch adds an of_node_get() before of_find_matching_node() to avoid the use-after-free problem. Fixes: e7eef1d7633a ("fpga: add intel stratix10 soc fpga manager driver") Signed-off-by: Wen Yang Cc: Alan Tull Cc: Moritz Fischer Cc: Nicolas Saenz Julienne Cc: linux-fpga@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Moritz Fischer Reviewed-by: Nicolas Saenz Julienne Acked-by: Alan Tull Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/fpga/stratix10-soc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c index 13851b3d1c56..215d33789c74 100644 --- a/drivers/fpga/stratix10-soc.c +++ b/drivers/fpga/stratix10-soc.c @@ -507,12 +507,16 @@ static int __init s10_init(void) if (!fw_np) return -ENODEV; + of_node_get(fw_np); np = of_find_matching_node(fw_np, s10_of_match); - if (!np) + if (!np) { + of_node_put(fw_np); return -ENODEV; + } of_node_put(np); ret = of_platform_populate(fw_np, s10_of_match, NULL, NULL); + of_node_put(fw_np); if (ret) return ret; -- 2.20.1