mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
[PATCH] 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> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
abf75a5033
commit
d579091b43
1 changed files with 3 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue