DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

VLAN: Warn about interface name truncation

Browse source 
Add more snprintf checks to make it clearer if some of the ifname
constructions would end up being too long.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2018-12-03 12:44:11 +02:00
parent f2973fa39d
commit 9da196adf9
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/ap/vlan_full.c
View file

@ -363,12 +363,18 @@ static void vlan_newlink_tagged(int vlan_naming, const char *tagged_interface,
{ {
char vlan_ifname[IFNAMSIZ]; char vlan_ifname[IFNAMSIZ];
int clean; int clean;
int ret;
if (vlan_naming == DYNAMIC_VLAN_NAMING_WITH_DEVICE) if (vlan_naming == DYNAMIC_VLAN_NAMING_WITH_DEVICE)
os_snprintf(vlan_ifname, sizeof(vlan_ifname), "%s.%d", ret = os_snprintf(vlan_ifname, sizeof(vlan_ifname), "%s.%d",
tagged_interface, vid); tagged_interface, vid);
else else
os_snprintf(vlan_ifname, sizeof(vlan_ifname), "vlan%d", vid); ret = os_snprintf(vlan_ifname, sizeof(vlan_ifname), "vlan%d",
vid);
if (ret >= (int) sizeof(vlan_ifname))
wpa_printf(MSG_WARNING,
"VLAN: Interface name was truncated to %s",
vlan_ifname);
clean = 0; clean = 0;
ifconfig_up(tagged_interface); ifconfig_up(tagged_interface);
@ -387,16 +393,21 @@ static void vlan_newlink_tagged(int vlan_naming, const char *tagged_interface,
static void vlan_bridge_name(char *br_name, struct hostapd_data *hapd, int vid) static void vlan_bridge_name(char *br_name, struct hostapd_data *hapd, int vid)
{ {
char *tagged_interface = hapd->conf->ssid.vlan_tagged_interface; char *tagged_interface = hapd->conf->ssid.vlan_tagged_interface;
int ret;
if (hapd->conf->vlan_bridge[0]) { if (hapd->conf->vlan_bridge[0]) {
os_snprintf(br_name, IFNAMSIZ, "%s%d", ret = os_snprintf(br_name, IFNAMSIZ, "%s%d",
hapd->conf->vlan_bridge, vid); hapd->conf->vlan_bridge, vid);
} else if (tagged_interface) { } else if (tagged_interface) {
os_snprintf(br_name, IFNAMSIZ, "br%s.%d", ret = os_snprintf(br_name, IFNAMSIZ, "br%s.%d",
tagged_interface, vid); tagged_interface, vid);
} else { } else {
os_snprintf(br_name, IFNAMSIZ, "brvlan%d", vid); ret = os_snprintf(br_name, IFNAMSIZ, "brvlan%d", vid);
} }
if (ret >= IFNAMSIZ)
wpa_printf(MSG_WARNING,
"VLAN: Interface name was truncated to %s",
br_name);
} }
@ -474,12 +485,19 @@ static void vlan_dellink_tagged(int vlan_naming, const char *tagged_interface,
{ {
char vlan_ifname[IFNAMSIZ]; char vlan_ifname[IFNAMSIZ];
int clean; int clean;
int ret;
if (vlan_naming == DYNAMIC_VLAN_NAMING_WITH_DEVICE) if (vlan_naming == DYNAMIC_VLAN_NAMING_WITH_DEVICE)
os_snprintf(vlan_ifname, sizeof(vlan_ifname), "%s.%d", ret = os_snprintf(vlan_ifname, sizeof(vlan_ifname), "%s.%d",
tagged_interface, vid); tagged_interface, vid);
else else
os_snprintf(vlan_ifname, sizeof(vlan_ifname), "vlan%d", vid); ret = os_snprintf(vlan_ifname, sizeof(vlan_ifname), "vlan%d",
vid);
if (ret >= (int) sizeof(vlan_ifname))
wpa_printf(MSG_WARNING,
"VLAN: Interface name was truncated to %s",
vlan_ifname);
clean = dyn_iface_put(hapd, vlan_ifname); clean = dyn_iface_put(hapd, vlan_ifname);