Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 20 Aug 2015 14:51:12 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r286963 - head/usr.bin/truss
Message-ID:  <201508201451.t7KEpCUl084342@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jhb
Date: Thu Aug 20 14:51:11 2015
New Revision: 286963
URL: https://svnweb.freebsd.org/changeset/base/286963

Log:
  Handle the conditional decoding of execve() argument and environment
  arrays generically rather than duplicating a hack in all of the backends.
  - Add two new system call argument types and use them instead of StringArray
    for the argument and environment arguments execve and linux_execve.
  - Honor the -a/-e flags in the handling of these new types.
  - Instead of printing "<missing argument>" when the decoding is disabled,
    print the raw pointer value.

Modified:
  head/usr.bin/truss/amd64-fbsd.c
  head/usr.bin/truss/amd64-fbsd32.c
  head/usr.bin/truss/amd64-linux32.c
  head/usr.bin/truss/arm-fbsd.c
  head/usr.bin/truss/i386-fbsd.c
  head/usr.bin/truss/i386-linux.c
  head/usr.bin/truss/mips-fbsd.c
  head/usr.bin/truss/powerpc-fbsd.c
  head/usr.bin/truss/powerpc64-fbsd.c
  head/usr.bin/truss/sparc64-fbsd.c
  head/usr.bin/truss/syscall.h
  head/usr.bin/truss/syscalls.c

Modified: head/usr.bin/truss/amd64-fbsd.c
==============================================================================
--- head/usr.bin/truss/amd64-fbsd.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/amd64-fbsd.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -233,28 +233,6 @@ amd64_syscall_entry(struct trussinfo *tr
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/amd64-fbsd32.c
==============================================================================
--- head/usr.bin/truss/amd64-fbsd32.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/amd64-fbsd32.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -233,28 +233,6 @@ amd64_fbsd32_syscall_entry(struct trussi
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "freebsd32_execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "freebsd32_execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/amd64-linux32.c
==============================================================================
--- head/usr.bin/truss/amd64-linux32.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/amd64-linux32.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -206,28 +206,6 @@ amd64_linux32_syscall_entry(struct truss
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "linux_execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "linux_execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/arm-fbsd.c
==============================================================================
--- head/usr.bin/truss/arm-fbsd.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/arm-fbsd.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -264,28 +264,6 @@ arm_syscall_entry(struct trussinfo *trus
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/i386-fbsd.c
==============================================================================
--- head/usr.bin/truss/i386-fbsd.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/i386-fbsd.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -227,28 +227,6 @@ i386_syscall_entry(struct trussinfo *tru
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/i386-linux.c
==============================================================================
--- head/usr.bin/truss/i386-linux.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/i386-linux.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -206,28 +206,6 @@ i386_linux_syscall_entry(struct trussinf
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "linux_execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "linux_execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/mips-fbsd.c
==============================================================================
--- head/usr.bin/truss/mips-fbsd.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/mips-fbsd.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -261,28 +261,6 @@ mips_syscall_entry(struct trussinfo *tru
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/powerpc-fbsd.c
==============================================================================
--- head/usr.bin/truss/powerpc-fbsd.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/powerpc-fbsd.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -238,28 +238,6 @@ powerpc_syscall_entry(struct trussinfo *
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/powerpc64-fbsd.c
==============================================================================
--- head/usr.bin/truss/powerpc64-fbsd.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/powerpc64-fbsd.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -226,28 +226,6 @@ powerpc64_syscall_entry(struct trussinfo
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/sparc64-fbsd.c
==============================================================================
--- head/usr.bin/truss/sparc64-fbsd.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/sparc64-fbsd.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -255,28 +255,6 @@ sparc64_syscall_entry(struct trussinfo *
 	fprintf(trussinfo->outfile, "\n");
 #endif
 
-	if (fsc->name != NULL && (strcmp(fsc->name, "execve") == 0 ||
-	    strcmp(fsc->name, "exit") == 0)) {
-		/*
-		 * XXX
-		 * This could be done in a more general
-		 * manner but it still wouldn't be very pretty.
-		 */
-		if (strcmp(fsc->name, "execve") == 0) {
-			if ((trussinfo->flags & EXECVEARGS) == 0) {
-				if (fsc->s_args[1]) {
-					free(fsc->s_args[1]);
-					fsc->s_args[1] = NULL;
-				}
-			}
-			if ((trussinfo->flags & EXECVEENVS) == 0) {
-				if (fsc->s_args[2]) {
-					free(fsc->s_args[2]);
-					fsc->s_args[2] = NULL;
-				}
-			}
-		}
-	}
 	trussinfo->curthread->fsc = fsc;
 }
 

Modified: head/usr.bin/truss/syscall.h
==============================================================================
--- head/usr.bin/truss/syscall.h	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/syscall.h	Thu Aug 20 14:51:11 2015	(r286963)
@@ -42,7 +42,7 @@ enum Argtype { None = 1, Hex, Octal, Int
 	Fcntlflag, Rusage, BinString, Shutdown, Resource, Rlimit, Timeval2,
 	Pathconf, Rforkflags, ExitStatus, Waitoptions, Idtype, Procctl,
 	LinuxSockArgs, Umtxop, Atfd, Atflags, Timespec2, Accessmode, Long,
-	Sysarch };
+	Sysarch, ExecArgs, ExecEnv };
 
 #define	ARG_MASK	0xff
 #define	OUT	0x100

Modified: head/usr.bin/truss/syscalls.c
==============================================================================
--- head/usr.bin/truss/syscalls.c	Thu Aug 20 14:33:30 2015	(r286962)
+++ head/usr.bin/truss/syscalls.c	Thu Aug 20 14:51:11 2015	(r286963)
@@ -245,11 +245,11 @@ static struct syscall syscalls[] = {
 	  .args = { { Int, 0 }, { BinString | IN, 1 }, { Int, 2 }, { Hex, 3 },
 		    { Sockaddr | IN, 4 }, { Ptr | IN, 5 } } },
 	{ .name = "execve", .ret_type = 1, .nargs = 3,
-	  .args = { { Name | IN, 0 }, { StringArray | IN, 1 },
-		    { StringArray | IN, 2 } } },
+	  .args = { { Name | IN, 0 }, { ExecArgs | IN, 1 },
+		    { ExecEnv | IN, 2 } } },
 	{ .name = "linux_execve", .ret_type = 1, .nargs = 3,
-	  .args = { { Name | IN, 0 }, { StringArray | IN, 1 },
-		    { StringArray | IN, 2 } } },
+	  .args = { { Name | IN, 0 }, { ExecArgs | IN, 1 },
+		    { ExecEnv | IN, 2 } } },
 	{ .name = "kldload", .ret_type = 0, .nargs = 1,
 	  .args = { { Name | IN, 0 } } },
 	{ .name = "kldunload", .ret_type = 0, .nargs = 1,
@@ -912,6 +912,8 @@ print_arg(struct syscall_args *sc, unsig
 		}
 		break;
 	}
+	case ExecArgs:
+	case ExecEnv:
 	case StringArray: {
 		uintptr_t addr;
 		union {
@@ -923,6 +925,18 @@ print_arg(struct syscall_args *sc, unsig
 		int first, i;
 
 		/*
+		 * Only parse argv[] and environment arrays from exec calls
+		 * if requested.
+		 */
+		if (((sc->type & ARG_MASK) == ExecArgs &&
+		    (trussinfo->flags & EXECVEARGS) == 0) ||
+		    ((sc->type & ARG_MASK) == ExecEnv &&
+		    (trussinfo->flags & EXECVEENVS) == 0)) {
+			fprintf(fp, "0x%lx", args[sc->offset]);
+			break;
+		}
+		    
+		/*
 		 * Read a page of pointers at a time.  Punt if the top-level
 		 * pointer is not aligned.  Note that the first read is of
 		 * a partial page.

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508201451.t7KEpCUl084342>