aboutsummaryrefslogtreecommitdiff
path: root/ipc/util.h
diff options
context:
space:
mode:
authorPavel Emelianov <xemul@openvz.org>2006-11-02 22:07:03 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-03 12:27:56 -0800
commitc7e12b838989b0e432c7a1cdf1e6c6fd936007f6 (patch)
tree31a6eea1d9ace0b467ab6bb209dd6a883910d682 /ipc/util.h
parent733b72c31efb0d6b29577655939ccfe835381b52 (diff)
downloadlinux-2.6.34-ux500-c7e12b838989b0e432c7a1cdf1e6c6fd936007f6.tar.gz
[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.h')
-rw-r--r--ipc/util.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/ipc/util.h b/ipc/util.h
index c8fd6b9d77b..e3aa2c5c97d 100644
--- a/ipc/util.h
+++ b/ipc/util.h
@@ -83,6 +83,18 @@ void* ipc_rcu_alloc(int size);
void ipc_rcu_getref(void *ptr);
void ipc_rcu_putref(void *ptr);
+static inline void __ipc_fini_ids(struct ipc_ids *ids,
+ struct ipc_id_ary *entries)
+{
+ if (entries != &ids->nullentry)
+ ipc_rcu_putref(entries);
+}
+
+static inline void ipc_fini_ids(struct ipc_ids *ids)
+{
+ __ipc_fini_ids(ids, ids->entries);
+}
+
struct kern_ipc_perm* ipc_get(struct ipc_ids* ids, int id);
struct kern_ipc_perm* ipc_lock(struct ipc_ids* ids, int id);
void ipc_lock_by_ptr(struct kern_ipc_perm *ipcp);