Module: xenomai-3
Branch: wip/rtnet-fixes
Commit: 5511e76040444af875ae1bb099c13a25b16336fc
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=5511e76040444af875ae1bb099c13a25b16336fc
Author: Henning Schild <henning.sch...@siemens.com>
Date: Fri Feb 16 14:13:00 2018 +0100
boilerplate/setup: introduce destructors for __setup_call
Whit dlclose() we can actually invalidate the setup_list, it might end
up containing pointers to memory that got unmapped with dlclose(). The
next dlopen() will then cause a segfault.
Add destructors to that such referrences are remove from the setup_list
when calling dlclose().
The previous commit added a testcase that fails because of that issue,
with this commit the test runs fine.
Signed-off-by: Henning Schild <henning.sch...@siemens.com>
---
include/boilerplate/setup.h | 7 +++++++
lib/boilerplate/setup.c | 6 ++++++
2 files changed, 13 insertions(+)
diff --git a/include/boilerplate/setup.h b/include/boilerplate/setup.h
index 7df3cfe..83af91f 100644
--- a/include/boilerplate/setup.h
+++ b/include/boilerplate/setup.h
@@ -78,10 +78,16 @@ struct setup_descriptor {
#define __early_ctor __attribute__ ((constructor(210)))
#define __bootstrap_ctor __attribute__ ((constructor(220)))
+#define __setup_dtor __attribute__ ((destructor(200)))
+
#define __setup_call(__name, __id) \
static __setup_ctor void __declare_ ## __name(void) \
{ \
__register_setup_call(&(__name), __id); \
+} \
+static __setup_dtor void __undeclare_ ## __name(void) \
+{ \
+ __unregister_setup_call(&(__name), __id); \
}
#define core_setup_call(__name) __setup_call(__name, 0)
@@ -96,6 +102,7 @@ extern "C" {
#endif
void __register_setup_call(struct setup_descriptor *p, int id);
+void __unregister_setup_call(struct setup_descriptor *p, int id);
extern pid_t __node_id;
diff --git a/lib/boilerplate/setup.c b/lib/boilerplate/setup.c
index f749828..9e4ee34 100644
--- a/lib/boilerplate/setup.c
+++ b/lib/boilerplate/setup.c
@@ -698,6 +698,12 @@ void __register_setup_call(struct setup_descriptor *p, int
id)
pvlist_prepend(&p->__reserved.next, &setup_list);
}
+void __unregister_setup_call(struct setup_descriptor *p, int id)
+{
+ pvlist_remove(&p->__reserved.next);
+}
+
+
const char *get_program_name(void)
{
return basename(__base_setup_data.arg0 ?: "program");
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
