diff options
| author | Kirill Korotaev <dev@openvz.org> | 2006-10-13 17:58:30 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-10-13 17:58:30 +0200 |
| commit | e2e103083eb3af79fd5976763251d116366f7ef0 (patch) | |
| tree | 4e28833a35ce547a0daa416e136a1dd5a1936cca /fs | |
| parent | 196be852be1148e604086eccff9c40df8207925d (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: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'fs')
| -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 cea7cbea11d..44ab07a080e 100644 --- a/fs/file.c +++ b/fs/file.c @@ -283,11 +283,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); |