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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
b66a64d8fa
commit
1dff316b54
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user