bugfix

dhcp.spec

@@ -3,7 +3,7 @@
 
 Name:      dhcp
 Version:   4.3.6
-Release:   34
+Release:   35
 Summary:   Dynamic host configuration protocol software
 #Please don't change the epoch on this package
 Epoch:     12
@@ -68,6 +68,7 @@ Patch6004: bugfix-reduce-getifaddr-calls.patch
 Patch9000: dhcp-fix-dhclient-default-len-64-to-128.patch
 Patch9001: bugfix-dhcpd-2038-problem.patch
 Patch9002: adds-address-prefix-len-to-dhclient-cli.patch
+Patch9003: dhcpd-coredump-infiniband.patch
 
 BuildRequires: gcc autoconf automake libtool openldap-devel krb5-devel libcap-ng-devel bind-export-devel
 BuildRequires: systemd systemd-devel
@@ -304,6 +305,12 @@ exit 0
 %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Wed Jan 22 2020 zhanglu<zhanglu37@huawei.com> - 4.3.6-35
+- Type:bugfix
+- ID:NA
+- SUG:restart
+- DESC: modify dhcpd coredump when discover interfaces
+
 * Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 4.3.6-34
 - Type:enhancement
 - ID:NA

dhcpd-coredump-infiniband.patch

@@ -0,0 +1,36 @@
+From d7b7c875ca93e2bca12d6cf5ff02d78d03030cf9 Mon Sep 17 00:00:00 2001
+From: zhanglu <zhanglu37@huawei.com>
+Date: Wed, 22 Jan 2020 14:39:19 +0800
+Subject: [PATCH] dhcpd-coredump-infiniband.patch
+
+---
+ common/lpf.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/common/lpf.c b/common/lpf.c
+index 0cc9e8a..a3f0ead 100644
+--- a/common/lpf.c
++++ b/common/lpf.c
+@@ -754,6 +754,11 @@ get_hw_addr3(struct interface_info *info, struct ifaddrs *ifaddrs_start)
+ 			*/
+ 			if ((colon = strchr(dup, ':')) != NULL) {
+ 				*colon = '\0';
++
++				if (sll_allocated) {
++					dfree(sll, MDL);
++					sll_allocated = 0;
++				}
+ 				if ((sll = get_ll(ifaddrs, &ifa, dup)) == NULL)
+ 					log_fatal("Error getting hardware address for \"%s\": %m", name);
+ 			}
+@@ -802,7 +807,6 @@ get_hw_addr3(struct interface_info *info, struct ifaddrs *ifaddrs_start)
+ 
+ 	if (sll_allocated)
+ 		dfree(sll, MDL);
+-	//freeifaddrs(ifaddrs);
+         return result;
+ }
+ 
+-- 
+1.8.3.1
+