From a2422e707214a425e4e10ac5b7c39fc5ae4dea56 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Tue, 14 Apr 2009 12:33:28 -0400
Subject: 2009-04-14  Dave Brolley  <brolley@redhat.com>

	* translate.cxx (c_unparser::emit_unprivileged_user_check): Generate
	code to check _stp_unprivileged_user.
	* testsuite/lib/systemtap.exp (setup_server): Copy stap-env to $net_path.
	* runtime/transport/transport.c: Set up _stp_unprivileged_user.
	* runtime/staprun/staprun_funcs.c (check_signature): Distiguish among
	verification failure due to errors, tampering, untrusted signer.
	(check_permissions): Likewise.
	(check_groups): Set unprivileged_user.
	* runtime/staprun/staprun.c (insert_stap_module): Set _stp_unprivileged_user.
	* runtime/staprun/modverify.h (MODULE_OK): #define it.
	(MODULE_UNTRUSTED,MODULE_CHECK_ERROR,MODULE_ALTERED): Likewise.
	* runtime/staprun/modverify.c (modverify.h): #include it.
	(verify_it): Distiguish among verification failure due to errors,
	tampering, untrusted signer.
	(verify_module): Likewise.
	* runtime/staprun/common.c (unprivileged_user): Define it.
	* runtime/staprun/staprun.h (unprivileged_user): Declare it.
	* cache.cxx (get_from_cache): Get the module signature file.
	* stap-authorize-server-cert: Source `dirname $0`/stap-env.
	* stap-authorize-signing-cert: Likewise.
	* stap-client: Likewise.
	* stap-find-or-start-server: Likewise.
	* stap-find-servers: Likewise.
	* stap-gen-cert: Likewise.
	* stap-server: Likewise.
	* stap-serverd: Likewise.
	* stap-start-server: Likewise.
---
 runtime/staprun/staprun.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'runtime/staprun/staprun.c')

diff --git a/runtime/staprun/staprun.c b/runtime/staprun/staprun.c
index 42b72ff1..917990dc 100644
--- a/runtime/staprun/staprun.c
+++ b/runtime/staprun/staprun.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2009 Red Hat, Inc.
  *
  */
 
@@ -139,11 +139,21 @@ static int enable_uprobes(void)
 
 static int insert_stap_module(void)
 {
-	char bufsize_option[128];
+	char special_options[128];
+	char *bufptr = special_options;
 
-	if (snprintf_chk(bufsize_option, 128, "_stp_bufsize=%d", buffer_size))
+	/* Add the _stp_bufsize option.  */
+	if (snprintf_chk(bufptr, sizeof (special_options), "_stp_bufsize=%d", buffer_size))
 		return -1;
-	return insert_module(modpath, bufsize_option, modoptions);
+
+	/* Add the _stp_unprivileged_user option.  */
+	bufptr += strlen (bufptr);
+	if (snprintf_chk(bufptr,
+			 sizeof (special_options) - (bufptr - special_options),
+			 " _stp_unprivileged_user=%d", unprivileged_user))
+	  return -1;
+
+	return insert_module(modpath, special_options, modoptions);
 }
 
 static int remove_module(const char *name, int verb);
-- 
cgit