Applied to ckpt-v16-dev.
As per Dave's note, it will be helpful if you mention which
patches in the original patchset are affected by this one,
e.g. I added:
[re commit 615744ad97 ... c/r: support share-memory sysv-ipc]
Will make it easier to create the next clean patchset.
Thanks :)
Oren.
Serge E. Hallyn wrote:
> Else freeary will BUG out.
>
> Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
> ---
> 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);
_______________________________________________
Containers mailing list
Containers@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linux-foundation.org/mailman/listinfo/containers
