diff options
author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2020-02-27 13:45:49 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-16 16:44:53 +0000 |
commit | ae1001ab3a82de100619878644ff5e20d276eb6c (patch) | |
tree | 0cfb2de9e93bf7bc5156a582d5c24f922a2b7b4a /meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch | |
parent | f4f272f72c71fe1056f7658b767225139e797b27 (diff) | |
download | poky-ae1001ab3a82de100619878644ff5e20d276eb6c.tar.gz |
dhcp: Fix REQUIRE(ctx->running) assertion triggered on SIGTERM/SIGINT
Closed a small window of time between the installation of graceful
shutdown signal handlers and application context startup, during which
the receipt of shutdown signal would cause a REQUIRE() assertion to
occur. Note this issue is only visible when compiling with
ENABLE_GENTLE_SHUTDOWN defined.
Reference:
https://gitlab.isc.org/isc-projects/dhcp/issues/53
Upstream patches:
https://gitlab.isc.org/isc-projects/dhcp/commit/ce117de7a1ed3c4911b4009c1cc23fba85370a26
https://gitlab.isc.org/isc-projects/dhcp/commit/dbd36dfa82956b53683462afadfabb1b33fa3dd1
https://gitlab.isc.org/isc-projects/dhcp/commit/95944cab6035d20be270eec01254c7bb867ec705
(From OE-Core rev: 7235c62727e48415c4e81f852607311ec31b6e41)
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch')
-rw-r--r-- | meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch b/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch new file mode 100644 index 0000000000..a51b6cf526 --- /dev/null +++ b/meta/recipes-connectivity/dhcp/dhcp/0003-Addressed-review-comment.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From e4b54b4d676783152d487103714cba2913661ef8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas Markwalder <tmark@isc.org> | ||
3 | Date: Wed, 6 Nov 2019 15:53:50 -0500 | ||
4 | Subject: [PATCH 3/3] Addressed review comment. | ||
5 | |||
6 | omapip/isclib.c | ||
7 | Added use of IGNORE_UNUSED() | ||
8 | |||
9 | Upstream-Status: Backport [https://gitlab.isc.org/isc-projects/dhcp.git] | ||
10 | |||
11 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> | ||
12 | --- | ||
13 | omapip/isclib.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/omapip/isclib.c b/omapip/isclib.c | ||
17 | index 73e017c..1d52463 100644 | ||
18 | --- a/omapip/isclib.c | ||
19 | +++ b/omapip/isclib.c | ||
20 | @@ -151,7 +151,7 @@ handle_signal(int sig, void (*handler)(int)) { | ||
21 | */ | ||
22 | static void | ||
23 | set_ctx_running(isc_task_t *task, isc_event_t *event) { | ||
24 | - task = task; // unused; | ||
25 | + IGNORE_UNUSED(task); | ||
26 | dhcp_gbl_ctx.actx_running = ISC_TRUE; | ||
27 | |||
28 | if (shutdown_signal) { | ||
29 | -- | ||
30 | 2.23.0 | ||
31 | |||