Skip to content

L
lxc
Commit fbb16259 by Serge Hallyn Committed by Stéphane Graber
Options

conf.c: fix unprivileged network case

If unprivileged users are using a veth nic, then ifindex is still 0 at lxc_assign_network() (because lxc_create_network() was skipped). So check for that case before we use lxc->ifindex to decide if we have an empty network namespace. We probably should change the !netdev->ifindex check to a netdev->type == LXC_NET_EMPTY check, but I've been making enough mistakes today not to risk that. Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 7e7243e1
Showing with 5 additions and 4 deletions
src/lxc/conf.c
...@@ -3076,16 +3076,17 @@ int lxc_assign_network(struct lxc_list *network, pid_t pid) ...@@ -3076,16 +3076,17 @@ int lxc_assign_network(struct lxc_list *network, pid_t pid)
netdev = iterator->elem; netdev = iterator->elem;
/* empty network namespace, nothing to move */ if (netdev->type == LXC_NET_VETH && !am_root) {
if (!netdev->ifindex)
continue;
if (!am_root) {
if (unpriv_assign_nic(netdev, pid)) if (unpriv_assign_nic(netdev, pid))
return -1; return -1;
// TODO fill in netdev->ifindex and name // TODO fill in netdev->ifindex and name
continue; continue;
} }
/* empty network namespace, nothing to move */
if (!netdev->ifindex)
continue;
err = lxc_netdev_move_by_index(netdev->ifindex, pid); err = lxc_netdev_move_by_index(netdev->ifindex, pid);
if (err) { if (err) {
ERROR("failed to move '%s' to the container : %s", ERROR("failed to move '%s' to the container : %s",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment