From: Frank Ch. Eigler <fche@redhat.com>
Date: Thu, 1 Sep 2011 20:49:46 +0000 (-0400)
Subject: PR6503: make module notifier update kmodule section addresses, GRSECURITY version
X-Git-Tag: release-1.7~153^2~69
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=0b11a4c2adf033c57a6dff34103639c92176f952;p=systemtap.git

PR6503: make module notifier update kmodule section addresses, GRSECURITY version

Some struct module fields are renamed under STAPCONF_GRSECURITY.
---

diff --git a/runtime/transport/symbols.c b/runtime/transport/symbols.c
index 66e86b21a..e03ab8791 100644
--- a/runtime/transport/symbols.c
+++ b/runtime/transport/symbols.c
@@ -84,10 +84,18 @@ static int _stp_module_notifier (struct notifier_block * nb,
 
                    So we cheat.  It's under the sofa.  */
 
+#ifndef STAPCONF_GRSECURITY
                 _stp_kmodule_update_address(mod->name, ".text",
                                             (uintptr_t)mod->module_core);
                 _stp_kmodule_update_address(mod->name, ".init.text",
                                             (uintptr_t)mod->module_init);
+#else
+                _stp_kmodule_update_address(mod->name, ".text",
+                                            (uintptr_t)mod->module_core_rx);
+                _stp_kmodule_update_address(mod->name, ".init.text",
+                                            (uintptr_t)mod->module_init_rx);
+		/* XXX: also: module_*_rw for .data? */
+#endif
                 /* _stp_kmodule_update_address(mod->name,
                                                ".note.gnu.build-id", ??); */
         }