From e63f497d5f630a8f690eb13a6e96bfe727473dd3 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 14 Jul 2014 18:51:41 +0000 Subject: [PATCH] confile: sanity-check netdev->type before setting netdev->priv elements MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The netdev->priv is shared for the netdev types. A bad config file could mix configuration for different types, resulting in a bad netdev->priv when starting or even destroying a container. So sanity check the netdev->type before setting a netdev->priv element. This should fix https://github.com/lxc/lxc/issues/254 Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- src/lxc/confile.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/lxc/confile.c b/src/lxc/confile.c index e678e4bed..89ea22dc4 100644 --- a/src/lxc/confile.c +++ b/src/lxc/confile.c @@ -595,6 +595,10 @@ static int config_network_veth_pair(const char *key, const char *value, if (!netdev) return -1; + if (netdev->type != LXC_NET_VETH) { + ERROR("Invalid veth pair for a non-veth netdev") + return -1; + } return network_ifname(&netdev->priv.veth_attr.pair, value); } @@ -607,6 +611,10 @@ static int config_network_macvlan_mode(const char *key, const char *value, if (!netdev) return -1; + if (netdev->type != LXC_NET_MACVLAN) { + ERROR("Invalid macvlan.mode for a non-macvlan netdev") + return -1; + } return macvlan_mode(&netdev->priv.macvlan_attr.mode, value); } @@ -647,6 +655,10 @@ static int config_network_vlan_id(const char *key, const char *value, if (!netdev) return -1; + if (netdev->type != LXC_NET_VLAN) { + ERROR("Invalid vlan.id for a non-macvlan netdev") + return -1; + } if (get_u16(&netdev->priv.vlan_attr.vid, value, 0)) return -1; -- 2.47.2