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 92ce83a11e90..cfd5e3047bd8 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1026,10 +1026,10 @@ static void flush_old_files(struct files_struct * files)
1026 fdt = files_fdtable(files); 1026 fdt = files_fdtable(files);
1027 if (i >= fdt->max_fds) 1027 if (i >= fdt->max_fds)
1028 break; 1028 break;
1029 set = fdt->close_on_exec->fds_bits[j]; 1029 set = fdt->close_on_exec[j];
1030 if (!set) 1030 if (!set)
1031 continue; 1031 continue;
1032 fdt->close_on_exec->fds_bits[j] = 0; 1032 fdt->close_on_exec[j] = 0;
1033 spin_unlock(&files->file_lock); 1033 spin_unlock(&files->file_lock);
1034 for ( ; set ; i++,set >>= 1) { 1034 for ( ; set ; i++,set >>= 1) {
1035 if (set & 1) { 1035 if (set & 1) {
@@ -2078,8 +2078,8 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
2078 fd_install(0, rp); 2078 fd_install(0, rp);
2079 spin_lock(&cf->file_lock); 2079 spin_lock(&cf->file_lock);
2080 fdt = files_fdtable(cf); 2080 fdt = files_fdtable(cf);
2081 FD_SET(0, fdt->open_fds); 2081 __set_open_fd(0, fdt);
2082 FD_CLR(0, fdt->close_on_exec); 2082 __clear_close_on_exec(0, fdt);
2083 spin_unlock(&cf->file_lock); 2083 spin_unlock(&cf->file_lock);
2084 2084
2085 /* and disallow core files too */ 2085 /* and disallow core files too */