diff options
author | Pavel Emelianov <xemul@openvz.org> | 2006-11-03 01:07:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-03 15:27:56 -0500 |
commit | c7e12b838989b0e432c7a1cdf1e6c6fd936007f6 (patch) | |
tree | 31a6eea1d9ace0b467ab6bb209dd6a883910d682 /ipc/util.c | |
parent | 733b72c31efb0d6b29577655939ccfe835381b52 (diff) |
[PATCH] Fix ipc entries removal
Fix two issuses related to ipc_ids->entries freeing.
1. When freeing ipc namespace we need to free entries allocated
with ipc_init_ids().
2. When removing old entries in grow_ary() ipc_rcu_putref()
may be called on entries set to &ids->nullentry earlier in
ipc_init_ids().
This is almost impossible without namespaces, but with
them this situation becomes possible.
Found during OpenVZ testing after obvious leaks in beancounters.
Signed-off-by: Pavel Emelianov <xemul@openvz.org>
Cc: Kirill Korotaev <dev@openvz.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'ipc/util.c')
-rw-r--r-- | ipc/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/util.c b/ipc/util.c index 42479e4eec5..cd8bb14a431 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -301,7 +301,7 @@ static int grow_ary(struct ipc_ids* ids, int newsize) | |||
301 | */ | 301 | */ |
302 | rcu_assign_pointer(ids->entries, new); | 302 | rcu_assign_pointer(ids->entries, new); |
303 | 303 | ||
304 | ipc_rcu_putref(old); | 304 | __ipc_fini_ids(ids, old); |
305 | return newsize; | 305 | return newsize; |
306 | } | 306 | } |
307 | 307 | ||