2007-08-14 David Smith <dsmith@redhat.com>

	Merge from setuid-branch.  Changes also by Martin Hunt
	<hunt@redhat.com>.

	* staprun.c (init_staprun): Drop CAP_SYS_ADMIN when we're done
	with it.
	(main): Calls parse_modpath instead of path_parse_modname.  Just
	call parse_modpath with argv[optind]. Let it allocate and set
	modpath and modname.  If no modulename was given, display usage
	and exit.  Drop CAP_SYS_NICE when we're done with it.  Set
	atexit(exit_cleanup) so cleanup always gets called and modules get
	removed.  Call handle_symbols.
	(run_stapio): Set argv[0] to stapio so that it executes as itself
	instead of staprun.
	(cleanup): Only do cleanups once and only try to remove module
	when appropriate.
	(exit_cleanup): New. Calls cleanup().
	(mountfs): Sets uid to root before making directory and then
	restores uid.
	(setup_ctl_channel): Uses DEBUGFS define and improved
	error message.
	(setup_relayfs): Ditto.
	(setup_oldrelayfs): Uses DEBUGFS and RELAYFS defines.
	(run_stp_check): Replaced by mountfs().
	(mountfs): New function.  Replaces an external script with C code.
	(init_staprun): Calls mountfs() instead of run_stp_check().

	* staprun.h: Renamed path_parse_modname to parse_modpath.  Added
	MODULE_NAME_LEN define.  Added [_][p]err macros.  Removed
	VERSION_CMD.

	* mainloop.c (cleanup_and_exit): Make sure initialized is 2
	before exiting with code 2.
	(stp_main_loop): Set initialized to 2 when STP_TRANSPORT
	is received. Call cleanup_and_exit() with proper status.
	(start_cmd): exit 1 instead of -1.
	(system_cmd): Ditto.
	(init_staprun): Renamed init_stapio.
	(cleanup_and_exit): Set exit status.

	* cap.c: New file.
	* common.c: New file.
	* stapio.c: New file.
	* staprun_funcs.c: New file.
	* Makefile: Removed.

	* symbols.c (get_sections): Move the filter code up so that
	uninteresting section names are filtered out before
	attempting to open them.
	(do_kernel_symbols): Better detect overfow conditions and realloc
	new space.
	(do_module): After sending all modules, send a null message to
	indicate we are finished.

	* ctl.c (init_ctl_channel): When attempting to attach, if the
	control channel doesn't exist, print a better error message.

	* relay_old.c (init_oldrelayfs): Errors out if
	open_relayfs_files() couldn't open any files.

	PR 4795
	* mainloop.c (send_request): Fixed buffer overflow check.
	* staprun.h: Added buffer overflow checking versions of
	strcpy/sprintf/snprintf.
	* common.c (path_parse_modname): Checks for overflows on
	strcpy/sprintf/snprintf.
	(read_buffer_info): Ditto.
	* ctl.c (init_ctl_channel): Ditto.
	* relay.c (init_relayfs): Ditto.
	* relay_old.c (open_relayfs_files): Ditto.
	(init_oldrelayfs): Ditto.
	* staprun_funcs.c (insert_module): Ditto.
	(check_path): Ditto.
	* symbols.c (get_sections): Ditto.

1 files changed, 33 insertions, 25 deletions

diff --git a/runtime/staprun/relay.c b/runtime/staprun/relay.c
index 84e80660..30c4ce1e 100644
--- a/runtime/staprun/relay.c
+++ b/runtime/staprun/relay.c
@@ -74,9 +74,8 @@ static void *reader_thread(void *data)
 		cpu_set_t cpu_mask;
 		CPU_ZERO(&cpu_mask);
 		CPU_SET(cpu, &cpu_mask);
-		if( sched_setaffinity( 0, sizeof(cpu_mask), &cpu_mask ) < 0 ) {
-			perror("sched_setaffinity");
-		}
+		if( sched_setaffinity( 0, sizeof(cpu_mask), &cpu_mask ) < 0 )
+			_perr("sched_setaffinity");
 #ifdef NEED_PPOLL
 		/* Without a real ppoll, there is a small race condition that could */
 		/* block ppoll(). So use a timeout to prevent that. */
@@ -95,15 +94,14 @@ static void *reader_thread(void *data)
                 if (rc < 0) {
 			dbug(3, "cpu=%d poll=%d errno=%d\n", cpu, rc, errno);
                         if (errno != EINTR) {
-				fprintf(stderr, "poll error: %s\n",strerror(errno));
+				_perr("poll error");
 				return(NULL);
                         }
 			stop_threads = 1;
                 }
 		while ((rc = read(relay_fd[cpu], buf, sizeof(buf))) > 0) {
 			if (write(out_fd[cpu], buf, rc) != rc) {
-				fprintf(stderr, "Couldn't write to output fd %d for cpu %d, exiting: errcode = %d: %s\n", 
-					out_fd[cpu], cpu, errno, strerror(errno));
+				perr("Couldn't write to output %d for cpu %d, exiting.", out_fd[cpu], cpu);
 				return(NULL);
 			}
 		}
@@ -124,16 +122,21 @@ int init_relayfs(void)
 	char rqbuf[128];
 	char buf[PATH_MAX], relay_filebase[PATH_MAX];
 
-	dbug(1, "initializing relayfs\n");
+	dbug(2, "initializing relayfs\n");
 
 	reader[0] = (pthread_t)0;
 	relay_fd[0] = 0;
 	out_fd[0] = 0;
 
- 	if (statfs("/sys/kernel/debug", &st) == 0 && (int) st.f_type == (int) DEBUGFS_MAGIC)
- 		sprintf(relay_filebase, "/sys/kernel/debug/systemtap/%s", modname);
+ 	if (statfs("/sys/kernel/debug", &st) == 0
+	    && (int) st.f_type == (int) DEBUGFS_MAGIC) {
+		if (sprintf_chk(relay_filebase,
+				"/sys/kernel/debug/systemtap/%s",
+				modname))
+			return -1;
+	}
  	else {
-		fprintf(stderr,"Cannot find relayfs or debugfs mount point.\n");
+		err("Cannot find relayfs or debugfs mount point.\n");
 		return -1;
 	}
 
@@ -141,7 +144,8 @@ int init_relayfs(void)
 		bulkmode = 1;
 
 	for (i = 0; i < NR_CPUS; i++) {
-		sprintf(buf, "%s/trace%d", relay_filebase, i);
+		if (sprintf_chk(buf, "%s/trace%d", relay_filebase, i))
+			return -1;
 		dbug(2, "attempting to open %s\n", buf);
 		relay_fd[i] = open(buf, O_RDONLY | O_NONBLOCK);
 		if (relay_fd[i] < 0)
@@ -151,12 +155,12 @@ int init_relayfs(void)
 	dbug(2, "ncpus=%d, bulkmode = %d\n", ncpus, bulkmode);
 
 	if (ncpus == 0) {
-		err("couldn't open %s.\n", buf);
+		_err("couldn't open %s.\n", buf);
 		return -1;
 	}
 	if (ncpus > 1 && bulkmode == 0) {
-		err("ncpus=%d, bulkmode = %d\n", ncpus, bulkmode);
-		err("This is inconsistent! Please file a bug report. Exiting now.\n");
+		_err("ncpus=%d, bulkmode = %d\n", ncpus, bulkmode);
+		_err("This is inconsistent! Please file a bug report. Exiting now.\n");
 		return -1;
 	}
 
@@ -164,16 +168,20 @@ int init_relayfs(void)
 		for (i = 0; i < ncpus; i++) {
 			if (outfile_name) {
 				/* special case: for testing we sometimes want to write to /dev/null */
-				if (strcmp(outfile_name, "/dev/null") == 0)
-					strcpy(buf, outfile_name);
-				else
-					sprintf(buf, "%s_%d", outfile_name, i);
-			} else
-				sprintf(buf, "stpd_cpu%d", i);
+				if (strcmp(outfile_name, "/dev/null") == 0) {
+					strcpy(buf, "/dev/null");
+				} else {
+					if (sprintf_chk(buf, "%s_%d", outfile_name, i))
+						return -1;
+				}
+			} else {
+				if (sprintf_chk(buf, "stpd_cpu%d", i))
+					return -1;
+			}
 			
 			out_fd[i] = open (buf, O_CREAT|O_TRUNC|O_WRONLY, 0666);
 			if (out_fd[i] < 0) {
-				fprintf(stderr, "ERROR: couldn't open output file %s.\n", buf);
+				perr("Couldn't open output file %s", buf);
 				return -1;
 			}
 		}
@@ -182,7 +190,7 @@ int init_relayfs(void)
 		if (outfile_name) {
 			out_fd[0] = open (outfile_name, O_CREAT|O_TRUNC|O_WRONLY, 0666);
 			if (out_fd[0] < 0) {
-				fprintf(stderr, "ERROR: couldn't open output file %s.\n", outfile_name);
+				perr("Couldn't open output file %s", outfile_name);
 				return -1;
 			}
 		} else
@@ -191,9 +199,9 @@ int init_relayfs(void)
 	}
 	dbug(2, "starting threads\n");
 	for (i = 0; i < ncpus; i++) {
-		if (pthread_create(&reader[i], NULL, reader_thread, (void *)(long)i) < 0) {
-			fprintf(stderr, "failed to create thread\n");
-			perror("Error creating thread");
+		if (pthread_create(&reader[i], NULL, reader_thread,
+				   (void *)(long)i) < 0) {
+			_perr("failed to create thread");
 			return -1;
 		}
 	}