packages/dhcp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix coredump when client active is NULL

Browse Source
This commit is contained in:
renmingshuai 2022-02-07 21:48:30 +08:00
parent 02f3e7d9a6
commit 174b1aced9
2 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dhcp.spec
View File

@ -3,7 +3,7 @@
Name: dhcp Name: dhcp
Version: 4.4.2 Version: 4.4.2
Release: 9 Release: 10
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
#Please don't change the epoch on this package #Please don't change the epoch on this package
Epoch: 12 Epoch: 12
@ -56,6 +56,7 @@ Patch33: bugfix-dhcp-64-bit-lease-parse.patch
Patch35: backport-CVE-2021-25217.patch Patch35: backport-CVE-2021-25217.patch
Patch36: fix-multiple-definition-with-gcc-10-1.patch Patch36: fix-multiple-definition-with-gcc-10-1.patch
Patch37: fix-multiple-definition-with-gcc-10-2.patch Patch37: fix-multiple-definition-with-gcc-10-2.patch
Patch38: fix-coredump-when-client-active-is-NULL.patch
BuildRequires: gcc autoconf automake libtool openldap-devel krb5-devel libcap-ng-devel BuildRequires: gcc autoconf automake libtool openldap-devel krb5-devel libcap-ng-devel
BuildRequires: systemd systemd-devel BuildRequires: systemd systemd-devel
@ -294,6 +295,12 @@ exit 0
%{_mandir}/man3/omapi.3.gz %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Mon Feb 7 2022 renmingshuai <renmingshuai@huawei.com> - 4.4.2-10
- Type:bugfix
- ID:NA
- SUG:restart
- DESC:fix coredump when client active is NULL
* Wed Jan 12 2022 renmingshuai <renmingshuai@huawei.com> - 4.4.2-9 * Wed Jan 12 2022 renmingshuai <renmingshuai@huawei.com> - 4.4.2-9
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

67
fix-coredump-when-client-active-is-NULL.patch Normal file
View File

@ -0,0 +1,67 @@
From 098d7f8e2e2b468e6a615084fb4330fed49bb54a Mon Sep 17 00:00:00 2001
From: hanzhijun <hanzhijun1@huawei.com>
Date: Mon, 24 Aug 2020 15:39:53 +0800
Subject: [PATCH] fix coredump when client -> active is NULL
---
client/dhclient.c | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/client/dhclient.c b/client/dhclient.c
index 2a17bfd..7581670 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -2059,6 +2059,24 @@ void state_bound (cpp)
struct data_string ds;
ASSERT_STATE(state, S_BOUND);
+ if (!client -> active)
+ {
+ struct timeval tv;
+
+ log_error ("No active lease in bound.");
+ script_init(client, "FAIL", (struct string_list *)0);
+ if (client -> alias)
+ script_write_params(client, "alias_", client -> alias);
+ script_go(client);
+ client -> state = S_INIT;
+ tv.tv_sec = cur_tv.tv_sec + ((client->config->retry_interval + 1) / 2 +
+ (random() % client->config->retry_interval));
+ tv.tv_usec = ((tv.tv_sec - cur_tv.tv_sec) > 1) ?
+ random() % 1000000 : cur_tv.tv_usec;
+ add_timeout(&tv, state_init, client, 0, 0);
+ detach ();
+ return;
+ }
/* T1 has expired. */
make_request (client, client -> active);
@@ -3173,6 +3191,25 @@ void send_request (cpp)
return;
}
+ if (!client -> active && client -> state != S_REQUESTING)
+ {
+ struct timeval tv;
+
+ log_error ("No active lease in request.");
+ script_init(client, "FAIL", (struct string_list *)0);
+ if (client -> alias)
+ script_write_params(client, "alias_", client -> alias);
+ script_go(client);
+ client -> state = S_INIT;
+ tv.tv_sec = cur_tv.tv_sec + ((client->config->retry_interval + 1) / 2 +
+ (random() % client->config->retry_interval));
+ tv.tv_usec = ((tv.tv_sec - cur_tv.tv_sec) > 1) ?
+ random() % 1000000 : cur_tv.tv_usec;
+ add_timeout(&tv, state_init, client, 0, 0);
+ detach ();
+ return;
+ }
+
/* If we're in the reboot state, make sure the media is set up
correctly. */
if (client -> state == S_REBOOTING &&
--
2.27.0