1 files changed, 11 insertions, 3 deletions

diff --git a/fs/open.c b/fs/open.c
index 0d515d161974..e6991c1b5874 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -855,7 +855,7 @@ EXPORT_SYMBOL(dentry_open);
 /*
  * Find an empty file descriptor entry, and mark it busy.
  */
-int get_unused_fd(void)
+static int get_unused_fd_flags(int flags)
 {
         struct files_struct * files = current->files;
         int fd, error;
@@ -891,7 +891,10 @@ repeat:
         }
 
         FD_SET(fd, fdt->open_fds);
-        FD_CLR(fd, fdt->close_on_exec);
+        if (flags & O_CLOEXEC)
+                FD_SET(fd, fdt->close_on_exec);
+        else
+                FD_CLR(fd, fdt->close_on_exec);
         files->next_fd = fd + 1;
 #if 1
         /* Sanity check */
@@ -907,6 +910,11 @@ out:
         return error;
 }
 
+int get_unused_fd(void)
+{
+        return get_unused_fd_flags(0);
+}
+
 EXPORT_SYMBOL(get_unused_fd);
 
 static void __put_unused_fd(struct files_struct *files, unsigned int fd)
@@ -959,7 +967,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
         int fd = PTR_ERR(tmp);
 
         if (!IS_ERR(tmp)) {
-                fd = get_unused_fd();
+                fd = get_unused_fd_flags(flags);
                 if (fd >= 0) {
                         struct file *f = do_filp_open(dfd, tmp, flags, mode);
                         if (IS_ERR(f)) {