aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/exec.c b/fs/exec.c
index c8b63d14da85..9a1d9f0a60ab 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1028,10 +1028,10 @@ static void flush_old_files(struct files_struct * files)
1028 fdt = files_fdtable(files); 1028 fdt = files_fdtable(files);
1029 if (i >= fdt->max_fds) 1029 if (i >= fdt->max_fds)
1030 break; 1030 break;
1031 set = fdt->close_on_exec->fds_bits[j]; 1031 set = fdt->close_on_exec[j];
1032 if (!set) 1032 if (!set)
1033 continue; 1033 continue;
1034 fdt->close_on_exec->fds_bits[j] = 0; 1034 fdt->close_on_exec[j] = 0;
1035 spin_unlock(&files->file_lock); 1035 spin_unlock(&files->file_lock);
1036 for ( ; set ; i++,set >>= 1) { 1036 for ( ; set ; i++,set >>= 1) {
1037 if (set & 1) { 1037 if (set & 1) {
@@ -2067,8 +2067,8 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
2067 fd_install(0, rp); 2067 fd_install(0, rp);
2068 spin_lock(&cf->file_lock); 2068 spin_lock(&cf->file_lock);
2069 fdt = files_fdtable(cf); 2069 fdt = files_fdtable(cf);
2070 FD_SET(0, fdt->open_fds); 2070 __set_open_fd(0, fdt);
2071 FD_CLR(0, fdt->close_on_exec); 2071 __clear_close_on_exec(0, fdt);
2072 spin_unlock(&cf->file_lock); 2072 spin_unlock(&cf->file_lock);
2073 2073
2074 /* and disallow core files too */ 2074 /* and disallow core files too */