From f97003912201b629bf672e9013c5a20958349cce Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 3 Oct 2019 11:22:48 +0200
Subject: [PATCH] initrd: fix use-after-free for variable "s_gateway" in
 nmi_dt_reader_parse()

(cherry picked from commit 321a323df4ad5340eff843ceae1ffee2e8930066)
---
 src/initrd/nmi-dt-reader.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/initrd/nmi-dt-reader.c b/src/initrd/nmi-dt-reader.c
index d2e571d7a8..140ef12578 100644
--- a/src/initrd/nmi-dt-reader.c
+++ b/src/initrd/nmi-dt-reader.c
@@ -329,8 +329,6 @@ nmi_dt_reader_parse (const char *sysfs_dir)
 
 		if (netmask)
 			nm_ip_address_unref (netmask);
-		if (gateway)
-			nm_ip_address_unref (gateway);
 	}
 
 	if (!ipaddr) {
@@ -377,6 +375,8 @@ nmi_dt_reader_parse (const char *sysfs_dir)
 
 	if (ipaddr)
 		nm_ip_address_unref (ipaddr);
+	if (gateway)
+		nm_ip_address_unref (gateway);
 
 	if (duplex || speed || hwaddr || local_hwaddr) {
 		s_wired = nm_setting_wired_new ();