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 66e86b21a252e8cf27a10eb19aa1123e34fed2bf..e03ab87911e44c508276b0e864a31a87f467b728 100644 (file)
--- 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", ??); */
         }