matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #14223 from donaldsharp/interface_fies

Browse source 
zebra: Fix crashes in interface change
This commit is contained in:
Mark Stapp 2023-08-18 11:56:20 -04:00 committed by GitHub
parent 1b52af80fd 6349e49645
commit 852e24d7a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
zebra/if_netlink.c
View file

@ -635,8 +635,10 @@ static int netlink_bridge_vxlan_update(struct zebra_dplane_ctx *ctx,
struct bridge_vlan_info *vinfo;
struct zebra_dplane_bridge_vlan_info bvinfo;
if (!af_spec)
if (!af_spec) {
dplane_ctx_set_ifp_no_afspec(ctx);
return 0;
}
netlink_bridge_vxlan_vlan_vni_map_update(ctx, af_spec);
@ -644,8 +646,10 @@ static int netlink_bridge_vxlan_update(struct zebra_dplane_ctx *ctx,
* only 1 access VLAN is accepted.
*/
netlink_parse_rtattr_nested(aftb, IFLA_BRIDGE_MAX, af_spec);
if (!aftb[IFLA_BRIDGE_VLAN_INFO])
if (!aftb[IFLA_BRIDGE_VLAN_INFO]) {
dplane_ctx_set_ifp_no_bridge_vlan_info(ctx);
return 0;
}
vinfo = RTA_DATA(aftb[IFLA_BRIDGE_VLAN_INFO]);
bvinfo.flags = vinfo->flags;

6
zebra/interface.c
View file

@ -1853,9 +1853,15 @@ static void interface_bridge_vxlan_update(struct zebra_dplane_ctx *ctx,
struct zebra_if *zif = ifp->info;
const struct zebra_dplane_bridge_vlan_info *bvinfo;
if (dplane_ctx_get_ifp_no_afspec(ctx))
return;
if (IS_ZEBRA_VXLAN_IF_SVD(zif))
interface_bridge_vxlan_vlan_vni_map_update(ctx, ifp);
if (dplane_ctx_get_ifp_no_bridge_vlan_info(ctx))
return;
bvinfo = dplane_ctx_get_ifp_bridge_vlan_info(ctx);
if (!(bvinfo->flags & DPLANE_BRIDGE_VLAN_INFO_PVID))

30
zebra/zebra_dplane.c
View file

@ -197,6 +197,8 @@ struct dplane_intf_info {
bool startup;
uint8_t family;
struct zebra_vxlan_vni_array *vniarray;
bool no_bvinfo_avail;
bool no_afspec_avail;
struct zebra_dplane_bridge_vlan_info bvinfo;
struct zebra_dplane_bridge_vlan_info_array *bvarray;
@ -1355,6 +1357,34 @@ dplane_ctx_get_ifp_vxlan_vni_array(const struct zebra_dplane_ctx *ctx)
return ctx->u.intf.vniarray;
}
void dplane_ctx_set_ifp_no_afspec(struct zebra_dplane_ctx *ctx)
{
DPLANE_CTX_VALID(ctx);
ctx->u.intf.no_afspec_avail = true;
}
bool dplane_ctx_get_ifp_no_afspec(const struct zebra_dplane_ctx *ctx)
{
DPLANE_CTX_VALID(ctx);
return ctx->u.intf.no_afspec_avail;
}
void dplane_ctx_set_ifp_no_bridge_vlan_info(struct zebra_dplane_ctx *ctx)
{
DPLANE_CTX_VALID(ctx);
ctx->u.intf.no_bvinfo_avail = true;
}
bool dplane_ctx_get_ifp_no_bridge_vlan_info(struct zebra_dplane_ctx *ctx)
{
DPLANE_CTX_VALID(ctx);
return ctx->u.intf.no_bvinfo_avail;
}
void dplane_ctx_set_ifp_bridge_vlan_info(
struct zebra_dplane_ctx *ctx,
struct zebra_dplane_bridge_vlan_info *bvinfo)

4
zebra/zebra_dplane.h
View file

@ -429,6 +429,10 @@ struct zebra_dplane_bridge_vlan_info {
uint16_t flags;
uint16_t vid;
};
void dplane_ctx_set_ifp_no_afspec(struct zebra_dplane_ctx *ctx);
bool dplane_ctx_get_ifp_no_afspec(const struct zebra_dplane_ctx *ctx);
void dplane_ctx_set_ifp_no_bridge_vlan_info(struct zebra_dplane_ctx *ctx);
bool dplane_ctx_get_ifp_no_bridge_vlan_info(struct zebra_dplane_ctx *ctx);
void dplane_ctx_set_ifp_bridge_vlan_info(
struct zebra_dplane_ctx *ctx,
struct zebra_dplane_bridge_vlan_info *bvinfo);

3
zebra/zebra_l2.c
View file

@ -383,7 +383,8 @@ void zebra_l2_vxlanif_update_access_vlan(struct interface *ifp,
assert(zif);
/* This would be called only in non svd case */
assert(IS_ZEBRA_VXLAN_IF_VNI(zif));
if (!IS_ZEBRA_VXLAN_IF_VNI(zif))
return;
old_access_vlan = zif->l2info.vxl.vni_info.vni.access_vlan;
;