aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-07-31 04:54:53 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2017-07-31 04:54:53 +0200
commitbf1c344dfdc6f38ad6aa81c10b7b050e0dfc5d96 (patch)
treed9204645d9623fc0ac92871f7cf78475c4dbef86
parent32fdf2f9fc9a617918672d71579f4ad42eb9bde9 (diff)
downloadbusybox-bf1c344dfdc6f38ad6aa81c10b7b050e0dfc5d96.tar.gz
hush: if STANDALONE, close interactive fd for NOEXECed children
function old new delta pseudo_exec_argv 291 305 +14 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/hush.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c
index cc785d36b..8e9e0e9e8 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -6803,6 +6803,15 @@ static void restore_redirects(struct squirrel *sq)
restore_redirected_FILEs();
}
+#if ENABLE_FEATURE_SH_STANDALONE && BB_MMU
+static void close_saved_fds_and_FILE_list(void)
+{
+ if (G_interactive_fd)
+ close(G_interactive_fd);
+ close_all_FILE_list();
+}
+#endif
+
static int internally_opened_fd(int fd, struct squirrel *sq)
{
int i;
@@ -7325,8 +7334,12 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
if (a >= 0) {
# if BB_MMU /* see above why on NOMMU it is not allowed */
if (APPLET_IS_NOEXEC(a)) {
- /* Do not leak open fds from opened script files etc */
- close_all_FILE_list();
+ /* Do not leak open fds from opened script files etc.
+ * Testcase: interactive "ls -l /proc/self/fd"
+ * should not show tty fd open.
+ */
+ close_saved_fds_and_FILE_list();
+///FIXME: should also close saved redir fds
debug_printf_exec("running applet '%s'\n", argv[0]);
run_applet_no_and_exit(a, argv[0], argv);
}