From 8773eaa8a3075cd44f5cfc6d0b6d190f04a7b60d Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segoon@openwall.com>
Date: Wed, 3 Aug 2011 22:28:26 +0400
Subject: [PATCH] --- yaml --- r: 262333 b: refs/heads/master c:
 298507d4d2cff2248e84afcf646b697301294442 h: refs/heads/master i:   262331:
 22a8499d35b2ad85b91e2fbdeaf6de38ac3ddc70 v: v3

---
 [refs]          | 2 +-
 trunk/ipc/shm.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 32e4d1b3801a..4eca83900aa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33a30ed4bdccd95ed84a1a20c1fef8ac89788ce5
+refs/heads/master: 298507d4d2cff2248e84afcf646b697301294442
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index 7efff043ffbf..b5bae9d945b6 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/ipc/shm.c
@@ -304,6 +304,9 @@ void exit_shm(struct task_struct *task)
 {
 	struct ipc_namespace *ns = task->nsproxy->ipc_ns;
 
+	if (shm_ids(ns).in_use == 0)
+		return;
+
 	/* Destroy all already created segments, but not mapped yet */
 	down_write(&shm_ids(ns).rw_mutex);
 	if (shm_ids(ns).in_use)