Skip to content

L
lxc
Commit dae3fdf6 by Michael Santos Committed by Daniel Lezcano
Options

network: ensure interface name is NULL terminated

IFNAMSIZ includes the trailing NULL. Signed-off-by: 's avatarMichael Santos <michael.santos@gmail.com> Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent 76f74594
Showing with 11 additions and 11 deletions
src/lxc/network.c
...@@ -180,7 +180,7 @@ int lxc_netdev_rename_by_index(int ifindex, const char *newname) ...@@ -180,7 +180,7 @@ int lxc_netdev_rename_by_index(int ifindex, const char *newname)
return err; return err;
len = strlen(newname); len = strlen(newname);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto out; goto out;
err = -ENOMEM; err = -ENOMEM;
...@@ -215,7 +215,7 @@ int lxc_netdev_rename_by_name(const char *oldname, const char *newname) ...@@ -215,7 +215,7 @@ int lxc_netdev_rename_by_name(const char *oldname, const char *newname)
int len, index; int len, index;
len = strlen(oldname); len = strlen(oldname);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
return -EINVAL; return -EINVAL;
index = if_nametoindex(oldname); index = if_nametoindex(oldname);
...@@ -238,7 +238,7 @@ static int netdev_set_flag(const char *name, int flag) ...@@ -238,7 +238,7 @@ static int netdev_set_flag(const char *name, int flag)
err = -EINVAL; err = -EINVAL;
len = strlen(name); len = strlen(name);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto out; goto out;
err = -ENOMEM; err = -ENOMEM;
...@@ -285,7 +285,7 @@ int lxc_netdev_set_mtu(const char *name, int mtu) ...@@ -285,7 +285,7 @@ int lxc_netdev_set_mtu(const char *name, int mtu)
err = -EINVAL; err = -EINVAL;
len = strlen(name); len = strlen(name);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto out; goto out;
err = -ENOMEM; err = -ENOMEM;
...@@ -344,11 +344,11 @@ int lxc_veth_create(const char *name1, const char *name2) ...@@ -344,11 +344,11 @@ int lxc_veth_create(const char *name1, const char *name2)
err = -EINVAL; err = -EINVAL;
len = strlen(name1); len = strlen(name1);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto out; goto out;
len = strlen(name2); len = strlen(name2);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto out; goto out;
err = -ENOMEM; err = -ENOMEM;
...@@ -420,11 +420,11 @@ int lxc_vlan_create(const char *master, const char *name, ushort vlanid) ...@@ -420,11 +420,11 @@ int lxc_vlan_create(const char *master, const char *name, ushort vlanid)
err = -EINVAL; err = -EINVAL;
len = strlen(master); len = strlen(master);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto err3; goto err3;
len = strlen(name); len = strlen(name);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto err3; goto err3;
err = -ENOMEM; err = -ENOMEM;
...@@ -496,11 +496,11 @@ int lxc_macvlan_create(const char *master, const char *name, int mode) ...@@ -496,11 +496,11 @@ int lxc_macvlan_create(const char *master, const char *name, int mode)
err = -EINVAL; err = -EINVAL;
len = strlen(master); len = strlen(master);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto out; goto out;
len = strlen(name); len = strlen(name);
if (len == 1 || len > IFNAMSIZ) if (len == 1 || len >= IFNAMSIZ)
goto out; goto out;
err = -ENOMEM; err = -ENOMEM;
...@@ -750,7 +750,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname) ...@@ -750,7 +750,7 @@ int lxc_bridge_attach(const char *bridge, const char *ifname)
int fd, index, err; int fd, index, err;
struct ifreq ifr; struct ifreq ifr;
if (strlen(ifname) > IFNAMSIZ) if (strlen(ifname) >= IFNAMSIZ)
return -EINVAL; return -EINVAL;
index = if_nametoindex(ifname); index = if_nametoindex(ifname);
......
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