system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-08 20:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

ifconfig: Redo fix vlan/vlanproto reconfiguration

Browse Source 
When the if_vlan(4) interface has not been fully configured, i.e., a
bare interface without a physical interface associated with it,
retrieving the current settings of it and unconditionally overwriting
`params` will result in losing vlandev settings in `params`. That will
lead to failing to associate the if_vlan(4) interface with the requested
physical interface and the false report 'both vlan and vlandev must be
specified'.

Fix that by checking if the vlan interface has been fully configured.

The basic VLAN test is slightly modified to cover this case.

PR:		279181
Reviewed by:	kp
Tested by:	Mike Tancsa <mike@sentex.net>
Fixes:		b82b8055ad ifconfig: fix vlan/vlanproto reconfiguration
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D45283
This commit is contained in:
Zhenlei Huang 2024-05-22 00:35:01 +08:00
parent 48edad2edf
commit 76df3c57a0
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sbin/ifconfig/ifvlan.c
View File

@ -60,6 +60,7 @@
#include "ifconfig.h"
#define NOTAG ((u_short) -1)
#define NOPROTO ((u_short) -1)
static const char proto_8021Q[] = "802.1q";
static const char proto_8021ad[] = "802.1ad";
@ -67,7 +68,7 @@ static const char proto_qinq[] = "qinq";
static struct vlanreq params = {
.vlr_tag = NOTAG,
.vlr_proto = ETHERTYPE_VLAN,
.vlr_proto = NOPROTO,
};
static void
@ -157,6 +158,8 @@ vlan_create(if_ctx *ctx, struct ifreq *ifr)
errx(1, "must specify a tag for vlan create");
if (params.vlr_parent[0] == '\0')
errx(1, "must specify a parent device for vlan create");
if (params.vlr_proto == NOPROTO)
params.vlr_proto = ETHERTYPE_VLAN;
ifr->ifr_data = (caddr_t) &params;
}
ifcreate_ioctl(ctx, ifr);
@ -173,6 +176,8 @@ static void
vlan_set(int s, struct ifreq *ifr)
{
if (params.vlr_tag != NOTAG && params.vlr_parent[0] != '\0') {
if (params.vlr_proto == NOPROTO)
params.vlr_proto = ETHERTYPE_VLAN;
ifr->ifr_data = (caddr_t) &params;
if (ioctl(s, SIOCSETVLAN, (caddr_t)ifr) == -1)
err(1, "SIOCSETVLAN");
@ -196,8 +201,16 @@ setvlantag(if_ctx *ctx, const char *val, int dummy __unused)
errx(1, "value for vlan out of range");
if (ioctl_ctx_ifr(ctx, SIOCGETVLAN, &ifr) != -1) {
vreq.vlr_tag = params.vlr_tag;
memcpy(&params, &vreq, sizeof(params));
/*
* Retrieve the current settings if the interface has already
* been configured.
*/
if (vreq.vlr_parent[0] != '\0') {
if (params.vlr_parent[0] == '\0')
strlcpy(params.vlr_parent, vreq.vlr_parent, IFNAMSIZ);
if (params.vlr_proto == NOPROTO)
params.vlr_proto = vreq.vlr_proto;
}
vlan_set(ctx->io_s, &ifr);
}
}
@ -230,8 +243,16 @@ setvlanproto(if_ctx *ctx, const char *val, int dummy __unused)
errx(1, "invalid value for vlanproto");
if (ioctl_ctx_ifr(ctx, SIOCGETVLAN, &ifr) != -1) {
vreq.vlr_proto = params.vlr_proto;
memcpy(&params, &vreq, sizeof(params));
/*
* Retrieve the current settings if the interface has already
* been configured.
*/
if (vreq.vlr_parent[0] != '\0') {
if (params.vlr_parent[0] == '\0')
strlcpy(params.vlr_parent, vreq.vlr_parent, IFNAMSIZ);
if (params.vlr_tag == NOTAG)
params.vlr_tag = vreq.vlr_tag;
}
vlan_set(ctx->io_s, &ifr);
}
}

10
tests/sys/net/if_vlan.sh
View File

@ -22,8 +22,12 @@ basic_body()
jexec alcatraz ifconfig ${epair_vlan}a up
jexec alcatraz ifconfig ${vlan0} 10.0.0.1/24 up
vlan1=$(jexec singsing ifconfig vlan create vlandev ${epair_vlan}b \
vlan 42)
vlan1=$(jexec singsing ifconfig vlan create)
# Test associating the physical interface
atf_check -s exit:0 \
jexec singsing ifconfig ${vlan1} vlandev ${epair_vlan}b vlan 42
jexec singsing ifconfig ${epair_vlan}b up
jexec singsing ifconfig ${vlan1} 10.0.0.2/24 up
@ -37,7 +41,7 @@ basic_body()
# And change back
# Test changing the vlan ID
atf_check -s exit:0 \
jexec singsing ifconfig ${vlan1} vlandev ${epair_vlan}b vlan 42
jexec singsing ifconfig ${vlan1} vlan 42 vlandev ${epair_vlan}b
atf_check -s exit:0 -o ignore jexec singsing ping -c 1 10.0.0.1
}