From b2ea60606801aa9bf243f22318ac4bd8a25094fe Mon Sep 17 00:00:00 2001
From: David Smith <dsmith@redhat.com>
Date: Mon, 7 Dec 2009 15:17:58 -0600
Subject: [PATCH] PR 10641 fixed by checking module name in unprivileged mode.

* main.cxx (checkOptions): If in unprivileged mode, make sure module name
  starts with 'stap_'.
* testsuite/parseko/cmdline05.stp: New testcase.
* testsuite/parseok/cmdline03.stp: New testcase.
---
 main.cxx                        | 5 +++++
 testsuite/parseko/cmdline05.stp | 6 ++++++
 testsuite/parseok/cmdline03.stp | 6 ++++++
 3 files changed, 17 insertions(+)
 create mode 100755 testsuite/parseko/cmdline05.stp
 create mode 100755 testsuite/parseok/cmdline03.stp

diff --git a/main.cxx b/main.cxx
index 71c70df8b..69d7fa778 100644
--- a/main.cxx
+++ b/main.cxx
@@ -429,6 +429,11 @@ checkOptions (systemtap_session &s)
 	  cerr << "You can't specify -g and --unprivileged together." << endl;
 	  optionsConflict = true;
 	}
+      if (s.module_name.compare(0, 5, "stap_") != 0)
+	{
+	  cerr << "In unprivileged mode, the module name must start with 'stap_'." << endl;
+	  optionsConflict = true;
+	}
     }
 
   if (!s.kernel_symtab_path.empty())
diff --git a/testsuite/parseko/cmdline05.stp b/testsuite/parseko/cmdline05.stp
new file mode 100755
index 000000000..f8c437ea7
--- /dev/null
+++ b/testsuite/parseko/cmdline05.stp
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+# Make sure unprivileged ('--unprivileged') option isn't accepted when
+# a module name not starting with 'stap_' is used.
+
+stap --unprivileged -m 'nfs' -p1 -e 'probe begin { exit() }'
diff --git a/testsuite/parseok/cmdline03.stp b/testsuite/parseok/cmdline03.stp
new file mode 100755
index 000000000..d0ba5bbf1
--- /dev/null
+++ b/testsuite/parseok/cmdline03.stp
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+# Make sure unprivileged ('--unprivileged') option is accepted when a
+# module name starting with 'stap_' is used.
+
+stap --unprivileged -m 'stap_foo' -p1 -e 'probe begin { exit() }'
-- 
2.43.5