File 0004-dhcp6-don-t-add-free-d-IA-to-ia_pd_list-on-T1-T2-CVE.patch of Package wicked.14025

From fbed37cfa279efdd2048fe6e2baecbbf6d6fb2ac Mon Sep 17 00:00:00 2001
References: CVE-2019-18903,bsc#1160904
Upstream: yes
From: =?UTF-8?q?Rub=C3=A9n=20Torrero=20Marijnissen?=
 <rtorreromarijnissen@suse.com>
Date: Fri, 31 Jan 2020 10:40:00 +0000
Subject: [PATCH 1/2] dhcp6: don't add free'd IA to ia_pd_list on T1>T2
 (CVE-2019-18903,bsc#1160904)

---
 src/dhcp6/protocol.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/dhcp6/protocol.c b/src/dhcp6/protocol.c
index 1e1ef81d..7a0a6b7c 100644
--- a/src/dhcp6/protocol.c
+++ b/src/dhcp6/protocol.c
@@ -2572,7 +2572,7 @@ ni_dhcp6_option_parse_ia_pd(ni_buffer_t *bp,  ni_dhcp6_ia_t **ia_pd_list, const
 			ni_dhcp6_option_name(ia->type),
 			ia->renewal_time, ia->rebind_time);
 		/* DISCARD */
-		ni_dhcp6_ia_free(ia);
+		goto discard;
 	}
 
 	ni_dhcp6_ia_list_append(ia_pd_list, ia);
@@ -2581,6 +2581,10 @@ ni_dhcp6_option_parse_ia_pd(ni_buffer_t *bp,  ni_dhcp6_ia_t **ia_pd_list, const
 failure:
 	ni_dhcp6_ia_free(ia);
 	return -1;
+
+discard:
+	ni_dhcp6_ia_free(ia);
+	return 0;
 }
 
 static int
-- 
2.16.4