1 files changed, 24 insertions, 20 deletions

diff --git a/tapsets.cxx b/tapsets.cxx
index 50e80cf5..08de4050 100644
--- a/tapsets.cxx
+++ b/tapsets.cxx
@@ -367,11 +367,14 @@ struct dwarf_derived_probe: public derived_probe
 
   // Pattern registration helpers.
   static void register_statement_variants(match_node * root,
-					  dwarf_builder * dw);
+					  dwarf_builder * dw,
+					  bool unprivileged_ok_p = false);
   static void register_function_variants(match_node * root,
-					  dwarf_builder * dw);
+					 dwarf_builder * dw,
+					 bool unprivileged_ok_p = false);
   static void register_function_and_statement_variants(match_node * root,
-						       dwarf_builder * dw);
+						       dwarf_builder * dw,
+						       bool unprivileged_ok_p = false);
   static void register_patterns(systemtap_session& s);
 };
 
@@ -2818,25 +2821,28 @@ dwarf_derived_probe::dwarf_derived_probe(const string& funcname,
 
 void
 dwarf_derived_probe::register_statement_variants(match_node * root,
-						 dwarf_builder * dw)
+						 dwarf_builder * dw,
+						 bool unprivileged_ok_p)
 {
-  root->bind(dw);
+  root->allow_unprivileged(unprivileged_ok_p)->bind(dw);
 }
 
 void
 dwarf_derived_probe::register_function_variants(match_node * root,
-						dwarf_builder * dw)
-{
-  root->bind(dw);
-  root->bind(TOK_INLINE)->bind(dw);
-  root->bind(TOK_CALL)->bind(dw);
-  root->bind(TOK_RETURN)->bind(dw);
-  root->bind(TOK_RETURN)->bind_num(TOK_MAXACTIVE)->bind(dw);
+						dwarf_builder * dw,
+						bool unprivileged_ok_p)
+{
+  root->allow_unprivileged(unprivileged_ok_p)->bind(dw);
+  root->bind(TOK_INLINE)->allow_unprivileged(unprivileged_ok_p)->bind(dw);
+  root->bind(TOK_CALL)->allow_unprivileged(unprivileged_ok_p)->bind(dw);
+  root->bind(TOK_RETURN)->allow_unprivileged(unprivileged_ok_p)->bind(dw);
+  root->bind(TOK_RETURN)->bind_num(TOK_MAXACTIVE)->allow_unprivileged(unprivileged_ok_p)->bind(dw);
 }
 
 void
 dwarf_derived_probe::register_function_and_statement_variants(match_node * root,
-							      dwarf_builder * dw)
+							      dwarf_builder * dw,
+							      bool unprivileged_ok_p)
 {
   // Here we match 4 forms:
   //
@@ -2845,10 +2851,10 @@ dwarf_derived_probe::register_function_and_statement_variants(match_node * root,
   // .statement("foo")
   // .statement(0xdeadbeef)
 
-  register_function_variants(root->bind_str(TOK_FUNCTION), dw);
-  register_function_variants(root->bind_num(TOK_FUNCTION), dw);
-  register_statement_variants(root->bind_str(TOK_STATEMENT), dw);
-  register_statement_variants(root->bind_num(TOK_STATEMENT), dw);
+  register_function_variants(root->bind_str(TOK_FUNCTION), dw, unprivileged_ok_p);
+  register_function_variants(root->bind_num(TOK_FUNCTION), dw, unprivileged_ok_p);
+  register_statement_variants(root->bind_str(TOK_STATEMENT), dw, unprivileged_ok_p);
+  register_statement_variants(root->bind_num(TOK_STATEMENT), dw, unprivileged_ok_p);
 }
 
 void
@@ -2865,8 +2871,7 @@ dwarf_derived_probe::register_patterns(systemtap_session& s)
   root->bind(TOK_KERNEL)->bind_num(TOK_STATEMENT)->bind(TOK_ABSOLUTE)->bind(dw);
   root->bind(TOK_KERNEL)->bind_str(TOK_FUNCTION)->bind_str(TOK_LABEL)->bind(dw);
   root->bind_str(TOK_PROCESS)->bind_str(TOK_FUNCTION)->bind_str(TOK_LABEL)->bind(dw);
-
-  register_function_and_statement_variants(root->bind_str(TOK_PROCESS), dw);
+  register_function_and_statement_variants(root->bind_str(TOK_PROCESS), dw, false/*!unprivileged_ok_p*/);
   root->bind_str(TOK_PROCESS)->bind_str(TOK_MARK)->bind(dw);
   root->bind_str(TOK_PROCESS)->bind_num(TOK_MARK)->bind(dw);
 }
@@ -5706,7 +5711,6 @@ register_standard_tapsets(systemtap_session & s)
   register_tapset_timers(s);
   register_tapset_utrace(s);
 
-
   // dwarf-based kprobe/uprobe parts
   dwarf_derived_probe::register_patterns(s);