diff options
author | Wen Yang <wen.yang99@zte.com.cn> | 2019-05-10 00:08:26 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-25 06:34:48 +0300 |
commit | f42d43aed4d3853e1a8cd0e0230762ac5e38e5c0 (patch) | |
tree | 3c4213efe6a8d16c3455a9c17ea34d995263276f /drivers/fpga/stratix10-soc.c | |
parent | 6ff0a7300513b526ea3bc95b4c91f8113e1a9a92 (diff) | |
download | linux-f42d43aed4d3853e1a8cd0e0230762ac5e38e5c0.tar.xz |
fpga: stratix10-soc: fix use-after-free on s10_init()
[ 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 <wen.yang99@zte.com.cn>
Cc: Alan Tull <atull@kernel.org>
Cc: Moritz Fischer <mdf@kernel.org>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Cc: linux-fpga@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: Moritz Fischer <mdf@kernel.org>
Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Acked-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/fpga/stratix10-soc.c')
-rw-r--r-- | drivers/fpga/stratix10-soc.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; |