diff options
| -rw-r--r-- | elaborate.cxx | 21 | ||||
| -rw-r--r-- | elaborate.h | 2 | ||||
| -rw-r--r-- | main.cxx | 2 |
3 files changed, 24 insertions, 1 deletions
diff --git a/elaborate.cxx b/elaborate.cxx index b760173f..7bece6d4 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -262,7 +262,9 @@ match_key::globmatch(match_key const & other) const match_node::match_node() : end(NULL) -{} +{ + unprivileged_whitelist.push_back ("process"); +} match_node * match_node::bind(match_key const & k) @@ -311,6 +313,23 @@ match_node::find_and_build (systemtap_session& s, vector<derived_probe *>& results) { assert (pos <= loc->components.size()); + + // If we are in --unprivileged mode, exclude all "unsafe" probes. + if (s.unprivileged && pos == 0) + { + unsigned i; + for (i = 0; i < unprivileged_whitelist.size(); i++) + { + if (unprivileged_whitelist[i] == loc->components[pos]->functor) + break; + } + if (i == unprivileged_whitelist.size()) { + throw semantic_error (string("probe class ") + + loc->components[pos]->functor + + " is not allowed for unprivileged users"); + } + } + if (pos == loc->components.size()) // matched all probe point components so far { derived_probe_builder *b = end; // may be 0 if only nested names are bound diff --git a/elaborate.h b/elaborate.h index d927177b..ca0182d1 100644 --- a/elaborate.h +++ b/elaborate.h @@ -237,6 +237,8 @@ match_node sub_map_t sub; derived_probe_builder* end; + std::vector<std::string> unprivileged_whitelist; + public: match_node(); @@ -610,6 +610,7 @@ main (int argc, char * const argv []) case 'g': s.guru_mode = true; + s.unprivileged = false; break; case 'P': @@ -752,6 +753,7 @@ main (int argc, char * const argv []) break; case LONG_OPT_UNPRIVILEGED: s.unprivileged = true; + s.guru_mode = false; break; default: cerr << "Internal error parsing command arguments." << endl; |