The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1504

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
(The code was moved here from the child side of the startup
without adapting the error case.)

Signed-off-by: Wolfgang Bumiller <w.bumil...@proxmox.com>
From 84ff3af745462126e1a62894d536626056ed3f0b Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumil...@proxmox.com>
Date: Tue, 11 Apr 2017 16:42:01 +0200
Subject: [PATCH] start: fix error handling when limits fail to apply

(The code was moved here from the child side of the startup
without adapting the error case.)

Signed-off-by: Wolfgang Bumiller <w.bumil...@proxmox.com>
---
 src/lxc/start.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lxc/start.c b/src/lxc/start.c
index fa1ade2..35d2ed5 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1263,7 +1263,7 @@ static int lxc_spawn(struct lxc_handler *handler)
 
        if (!lxc_list_empty(&handler->conf->limits) && 
setup_resource_limits(&handler->conf->limits, handler->pid)) {
                ERROR("failed to setup resource limits for '%s'", name);
-               return -1;
+               goto out_delete_net;
        }
 
        if (!cgroup_setup_limits(handler, true)) {
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to