@@ -125,13 +125,16 @@ static int dupfd(struct file *file, unsigned int start, int cloexec)
|
125 | 125 | return fd; |
126 | 126 | } |
127 | 127 | |
128 | | -asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd) |
| 128 | +asmlinkage long sys_dup3(unsigned int oldfd, unsigned int newfd, int flags) |
129 | 129 | { |
130 | 130 | int err = -EBADF; |
131 | 131 | struct file * file, *tofree; |
132 | 132 | struct files_struct * files = current->files; |
133 | 133 | struct fdtable *fdt; |
134 | 134 | |
| 135 | +if ((flags & ~O_CLOEXEC) != 0) |
| 136 | +return -EINVAL; |
| 137 | + |
135 | 138 | spin_lock(&files->file_lock); |
136 | 139 | if (!(file = fcheck(oldfd))) |
137 | 140 | goto out_unlock; |
@@ -163,7 +166,10 @@ asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)
|
163 | 166 | |
164 | 167 | rcu_assign_pointer(fdt->fd[newfd], file); |
165 | 168 | FD_SET(newfd, fdt->open_fds); |
166 | | -FD_CLR(newfd, fdt->close_on_exec); |
| 169 | +if (flags & O_CLOEXEC) |
| 170 | +FD_SET(newfd, fdt->close_on_exec); |
| 171 | +else |
| 172 | +FD_CLR(newfd, fdt->close_on_exec); |
167 | 173 | spin_unlock(&files->file_lock); |
168 | 174 | |
169 | 175 | if (tofree) |
@@ -181,6 +187,11 @@ asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd)
|
181 | 187 | goto out; |
182 | 188 | } |
183 | 189 | |
| 190 | +asmlinkage long sys_dup2(unsigned int oldfd, unsigned int newfd) |
| 191 | +{ |
| 192 | +return sys_dup3(oldfd, newfd, 0); |
| 193 | +} |
| 194 | + |
184 | 195 | asmlinkage long sys_dup(unsigned int fildes) |
185 | 196 | { |
186 | 197 | int ret = -EBADF; |
|