trace-cmd: Add option to execute traced process as given user
PATCH v2 1/1 trace-cmd: Add option to execute traced process as given user
From: "Tzvetomir Stoyanov (VMware)" <[email protected]>
A new trace-cmd record option is added: "--user". When it is set with combination of option -F, the traced process is executed in the context of the specified user.
---
[
Should be applied on top of patch "trace-cmd: Save the tracee memory map
into the trace.dat file."
v2 changes:
- Check for errors in change_user(). If an error occurs while changing the user, the message is printed and the traced process is not executed.
]
Documentation/trace-cmd-record.1.txt | 4 +++ tracecmd/trace-record.c | 47 ++++++++++++++++++++++++++-- tracecmd/trace-usage.c | 1 + 3 files changed, 49 insertions(+), 3 deletions(-)
Documentation/trace-cmd-record.1.txt +4 -0
@@ -122,6 +122,10 @@ OPTIONS *--mmap*:: Used with either *-F* or *-P*, save the traced process memory map into the trace.dat file. + +*--user*:: + Used with -F, execute the traced process as given user. + *-C* 'clock':: Set the trace clock to "clock".
tracecmd/trace-record.c +44 -3
101 lines not on this page · raw message
tracecmd/trace-usage.c +1 -0
@@ -58,6 +58,7 @@ static struct usage_help usage_help[] = {" --max-graph-depth limit function_graph depth\n" " --no-filter include trace-cmd threads in the trace\n" " --mmap used with -F or -P, save the traced process memory map into the trace.dat file\n" +" --user used with -F, execute the traced process as given user\n" }, { "start",
Signature · 1 line
2.21.0
Quoted 6 lines · On Fri, 5 Jul 2019 16:53:31 +0300 [email protected] wrote:
From: "Tzvetomir Stoyanov (VMware)" <[email protected]>
A new trace-cmd record option is added: "--user". When it is set with combination of option -F, the traced process is executed in the context of the specified user.
Yordan and Slavomir,
Care to review this patch?
Quoted 2 lines
Signed-off-by Tzvetomir Stoyanov (VMware) <[email protected]>Suggested-by Yordan Karadzhov (VMware) <[email protected]>
Ceco,
Note, it is better to add your Signed-of-by at the end. I know things like patchwork appear to insert everything after the Signed-off-by, and some people do it this way, but I think its best to see all the Signed-off-bys at the end, as they are the most important tags in the commit log.
Some comments below.
Quoted 21 lines
---
[
Should be applied on top of patch "trace-cmd: Save the tracee memory map
into the trace.dat file."v2 changes:
- Check for errors inchange_user(). If an error occurs while changing the user, the message is printed and the traced process is not executed.
]Documentation/trace-cmd-record.1.txt | 4 +++ tracecmd/trace-record.c | 47 ++++++++++++++++++++++++++-- tracecmd/trace-usage.c | 1 + 3 files changed, 49 insertions(+), 3 deletions(-)Documentation/trace-cmd-record.1.txt +0
-0
Documentation/trace-cmd-record.1.txt OPTIONS · line 127
Quoted 6 lines
Documentation/trace-cmd-record.1.txt +3
-0@@ -122,6 +122,10 @@ OPTIONS *--mmap*:: Used with either *-F* or *-P*, save the traced process memory map into the trace.dat file. + +*--user*:: + Used with -F, execute the traced process as given user.
Why does it have to be used with -F? I could see it this be useful for recording events other than just what is being executed.
Quoted 26 lines
Documentation/trace-cmd-record.1.txt +1
-0+ *-C* 'clock':: Set the trace clock to "clock".tracecmd/trace-record.c +3
-0@@ -33,6 +33,8 @@#include <errno.h> #include <limits.h> #include <libgen.h> +#include <pwd.h> +#include <grp.h> #include "version.h" #include "trace-local.h" @@ -208,6 +210,7 @@ struct common_record_context {struct buffer_instance *instance;const char *output;char *date2ts; +char *user;int data_flags;int record_all;
tracecmd/trace-record.c static void trace_or_sleep(enum trace_type type) · line 1428
Quoted 10 lines
tracecmd/trace-record.c +6
-1@@ -1417,7 +1420,34 @@ static void trace_or_sleep(enum trace_type type)sleep (10 ); } -static void run_cmd (enum trace_type type,int argc,char **argv) +static int change_user (char *user) +{ +struct passwd *pwd; + +if (!user) +return -1 ;
I would have this return 0, and then remove the check below, as it is redundant.
Quoted 26 lines
tracecmd/trace-record.c +22
-0+ + pwd =getpwnam (user); +if (!pwd) +return -1 ; +if (initgroups (user, pwd->pw_gid) <0 ) +return -1 ; +if (setgid (pwd->pw_gid) <0 ) +return -1 ; +if (setuid (pwd->pw_uid) <0 ) +return -1 ; + +if (setenv ("HOME" , pwd->pw_dir,1 ) <0 ) +return -1 ; +if (setenv ("USER" , pwd->pw_name,1 ) <0 ) +return -1 ; +if (setenv ("LOGNAME" , pwd->pw_name,1 ) <0 ) +return -1 ; + +return 0 ; +} + +static void run_cmd (enum trace_type type,char *user,int argc,char **argv) {int status;int pid;
tracecmd/trace-record.c static void run_cmd(enum trace_type type, int argc, char **argv) · line 1472
Quoted 5 lines
tracecmd/trace-record.c +2
-0@@ -1438,6 +1468,10 @@ static void run_cmd(enum trace_type type, int argc, char **argv)dup2 (save_stdout,1 );close (save_stdout); } + +if (user &&change_user (user) <0 )
With the change of !user return 0 above, we can make this:
if (change_user(user) < 0)
Quoted 32 lines
tracecmd/trace-record.c +7
-0+die ("Failed to change user to %s" , user); +if (execvp (argv[0 ], argv)) {fprintf (stderr,"\n********************\n" );fprintf (stderr," Unable to exec %s\n" , argv[0 ]);@@ -4548,6 +4582,7 @@ void update_first_instance(struct buffer_instance *instance, int topt) }enum { + OPT_user =243 , OPT_mmap =244 , OPT_quiet =245 , OPT_debug =246 ,@@ -4780,6 +4815,7 @@ static void parse_record_options(int argc, {"quiet", no_argument, NULL, OPT_quiet}, {"help", no_argument, NULL, '?'}, {"mmap", no_argument, NULL, OPT_mmap}, + {"user", required_argument, NULL, OPT_user}, {"module", required_argument, NULL, OPT_module}, {NULL, 0, NULL, 0} };@@ -5011,6 +5047,9 @@ static void parse_record_options(int argc,case 'i' : ignore_event_not_found =1 ;break ; +case OPT_user: + ctx->user =strdup (optarg); +break ;case OPT_mmap: get_mmap =1 ;break ;
tracecmd/trace-record.c static void parse_record_options(int argc, · line 5123
Quoted 7 lines
tracecmd/trace-record.c +3
-1@@ -5079,7 +5118,9 @@ static void parse_record_options(int argc,if (!ctx->filtered && ctx->instance->filter_mod)add_func (&ctx->instance->filter_funcs, ctx->instance->filter_mod,"*" ); - +if (ctx->user && !filter_task) +warning ("--user %s is ignored, no traced process is specified" , + ctx->user);
Should change this to:
if (ctx->user && !ctx->run_command)
Quoted 17 lines
tracecmd/trace-record.c +1
-1if (filter_task && get_mmap) do_ptrace =1 ;@@ -5237,7 +5278,7 @@ static void record_trace(int argc, char **argv, }if (ctx->run_command) -run_cmd (type, (argc - optind) -1 , &argv[optind +1 ]); +run_cmd (type, ctx->user, (argc - optind) -1 , &argv[optind +1 ]);else {update_task_filter ();tracecmd_enable_tracing ();tracecmd/trace-usage.c +0
-0
tracecmd/trace-usage.c static struct usage_help usage_help[] = { · line 61
Quoted 4 lines
tracecmd/trace-usage.c +1
-0@@ -58,6 +58,7 @@ static struct usage_help usage_help[] = {" --max-graph-depth limit function_graph depth\n" " --no-filter include trace-cmd threads in the trace\n" " --mmap used with -F or -P, save the traced process memory map into the trace.dat file\n" +" --user used with -F, execute the traced process as given user\n"
Again, let's not make it only for -F
Thanks!
-- Steve
Quoted 3 lines
tracecmd/trace-usage.c +0
-0}, { "start",