diff options
| author | Kirill Korotaev <dev@openvz.org> | 2006-07-11 04:37:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-07-24 20:35:27 -0700 |
| commit | 1dff316b54b9db4e17f191b4e12f032cde57b921 (patch) | |
| tree | 4043cc8c1cc9f0dfbf3564385de14be25cba6c7a | |
| parent | b66a64d8fa30e003494040d4a7eb6587fa3fffcc (diff) | |
fix fdset leakage
When found, it is obvious. nfds calculated when allocating fdsets is
rewritten by calculation of size of fdtable, and when we are unlucky, we
try to free fdsets of wrong size.
Found due to OpenVZ resource management (User Beancounters).
Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/file.c b/fs/file.c index 55f4e7022563..4c2cacca4e2e 100644 --- a/fs/file.c +++ b/fs/file.c @@ -277,11 +277,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); |