1 files changed, 4 insertions, 2 deletions

diff --git a/fs/file.c b/fs/file.c
index 3f356086061d..b3c6b82e6a9d 100644
--- a/fs/file.c
+++ b/fs/file.c
@@ -240,7 +240,7 @@ static struct fdtable *alloc_fdtable(int nr)
         if (!fdt)
                 goto out;
 
-        nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nfds));
+        nfds = max_t(int, 8 * L1_CACHE_BYTES, roundup_pow_of_two(nr + 1));
         if (nfds > NR_OPEN)
                 nfds = NR_OPEN;
 
@@ -273,11 +273,13 @@ static struct fdtable *alloc_fdtable(int nr)
         } while (nfds <= nr);
         new_fds = alloc_fd_array(nfds);
         if (!new_fds)
-                goto out;
+                goto out2;
         fdt->fd = new_fds;
         fdt->max_fds = nfds;
         fdt->free_files = NULL;
         return fdt;
+out2:
+        nfds = fdt->max_fdset;
 out:
         if (new_openset)
                 free_fdset(new_openset, nfds);