From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Serge E. Hallyn" Subject: [PATCH] cr: ipc: don't unlock before calling freeary in error path Date: Fri, 29 May 2009 15:23:06 -0500 Message-ID: <20090529202306.GA11982@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Oren Laadan Cc: Linux Containers List-Id: containers.vger.kernel.org Else freeary will BUG out. Signed-off-by: Serge E. Hallyn --- ipc/checkpoint_sem.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ipc/checkpoint_sem.c b/ipc/checkpoint_sem.c index 34dea40..e6934dc 100644 --- a/ipc/checkpoint_sem.c +++ b/ipc/checkpoint_sem.c @@ -206,12 +206,11 @@ int restore_ipc_sem(struct ckpt_ctx *ctx) memcpy(sem->sem_base, sma, sem->sem_nsems * sizeof(*sma)); ret = load_ipc_sem_hdr(ctx, h, sem); - ipc_unlock(perms); - if (ret < 0) { ckpt_debug("sem: need to remove (%d)\n", ret); freeary(current->nsproxy->ipc_ns, perms); - } + } else + ipc_unlock(perms); up_write(&sem_ids->rw_mutex); out: kfree(sma); -- 1.6.1