summaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorDenys Vlasenko2017-08-07 18:45:33 +0200
committerDenys Vlasenko2017-08-07 18:45:33 +0200
commitf2cf1cc716216308a8a6d07e3afab23be07a6b02 (patch)
tree81c2a8231d59e39ab1f3cecf219616f0104fea80 /shell
parent248a67fb75a0d2c98f4f9935b7bb9e11382b2c78 (diff)
downloadbusybox-f2cf1cc716216308a8a6d07e3afab23be07a6b02.zip
busybox-f2cf1cc716216308a8a6d07e3afab23be07a6b02.tar.gz
noexec: set comm field for noexecs
function old new delta set_task_comm - 18 +18 tryexec 152 159 +7 pseudo_exec_argv 321 328 +7 main 106 97 -9 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 3/2 up/down: 34/-13) Total: 23 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c5
-rw-r--r--shell/hush.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 0a323e9..507d15c 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -7803,8 +7803,11 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
while (*envp)
putenv(*envp++);
popredir(/*drop:*/ 1);
-//TODO: prctl(PR_SET_NAME, (long)argv[0], 0, 0, 0);? [think pidof, pgrep, pkill]
+//TODO: think pidof, pgrep, pkill!
+//set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"),
+//but one from procps-ng-3.3.10 needs more!
//Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!)
+ set_task_comm(argv[0]);
run_applet_no_and_exit(applet_no, cmd, argv);
}
/* re-exec ourselves with the new arguments */
diff --git a/shell/hush.c b/shell/hush.c
index b4fe714..021c1f0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -7387,8 +7387,11 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
/* Without this, "rm -i FILE" can't be ^C'ed: */
switch_off_special_sigs(G.special_sig_mask);
debug_printf_exec("running applet '%s'\n", argv[0]);
-//TODO: prctl(PR_SET_NAME, (long)argv[0], 0, 0, 0);? [think pidof, pgrep, pkill]
+//TODO: think pidof, pgrep, pkill!
+//set_task_comm() makes our pidof find NOEXECs (e.g. "yes >/dev/null"),
+//but one from procps-ng-3.3.10 needs more!
//Rewrite /proc/PID/cmdline? (need to save argv0 and length at init for this to work!)
+ set_task_comm(argv[0]);
run_applet_no_and_exit(a, argv[0], argv);
}
# endif