Skip to content

Fix ACL update crash by ignoring disabled actions #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sonikajindal merged 1 commit into from
Mar 25, 2026
+16 −10
Merged

Fix ACL update crash by ignoring disabled actions #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions dataplane/saiserver/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,17 +450,17 @@ func (a *acl) createAclEntryFields(req *saipb.CreateAclEntryRequest, id uint64,
}

func (a *acl) appendAclEntryActions(ctx context.Context, req *saipb.CreateAclEntryRequest, aReq *fwdpb.TableEntryAddRequest) error {
if req.ActionSetVrf != nil {
if req.ActionSetVrf != nil && req.ActionSetVrf.GetEnable() {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_VRF).
WithUint64Value(req.GetActionSetVrf().GetOid())).Build())
}
if req.ActionSetUserTrapId != nil {
if req.ActionSetUserTrapId != nil && req.ActionSetUserTrapId.GetEnable() {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_TRAP_ID).
WithUint64Value(req.GetActionSetUserTrapId().GetOid())).Build())
}
if req.ActionCounter != nil {
if req.ActionCounter != nil && req.ActionCounter.GetEnable() {
aReq.Actions = append(aReq.Actions, &fwdpb.ActionDesc{
ActionType: fwdpb.ActionType_ACTION_TYPE_FLOW_COUNTER,
Action: &fwdpb.ActionDesc_Flow{
Expand All @@ -472,7 +472,7 @@ func (a *acl) appendAclEntryActions(ctx context.Context, req *saipb.CreateAclEnt
},
})
}
if req.ActionRedirect != nil {
if req.ActionRedirect != nil && req.ActionRedirect.GetEnable() {
switch typ := a.mgr.GetType(fmt.Sprint(req.GetActionRedirect().GetOid())); typ {
case saipb.ObjectType_OBJECT_TYPE_L2MC_GROUP:
aReq.Actions = append(aReq.Actions, []*fwdpb.ActionDesc{
Expand Down Expand Up @@ -514,29 +514,29 @@ func (a *acl) appendAclEntryActions(ctx context.Context, req *saipb.CreateAclEnt
return status.Errorf(codes.InvalidArgument, "type %q is not supported; only support L2MC Group, Virtual Router, Next Hop, Next Hop Group, Port for ACL Redirect for now", typ.String())
}
}
if req.ActionSetPolicer != nil {
if req.ActionSetPolicer != nil && req.ActionSetPolicer.GetEnable() {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_POLICER_ID).
WithUint64Value(req.GetActionSetPolicer().GetOid())).Build(),
fwdconfig.Action(fwdconfig.LookupAction(policerTabler)).Build(),
)
}
if req.ActionSetOuterVlanId != nil {
if req.ActionSetOuterVlanId != nil && req.ActionSetOuterVlanId.GetEnable() {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_TAG).
WithValue(binary.BigEndian.AppendUint16(nil, uint16(req.GetActionSetOuterVlanId().GetUint())))).Build())
}
if req.ActionSetOuterVlanPri != nil {
if req.ActionSetOuterVlanPri != nil && req.ActionSetOuterVlanPri.GetEnable() {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_VLAN_PRIORITY).
WithValue([]byte{byte(req.GetActionSetOuterVlanPri().GetUint())})).Build())
}
if req.ActionSetTc != nil {
if req.ActionSetTc != nil && req.ActionSetTc.GetEnable() {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_IP_QOS).
WithValue([]byte{byte(req.GetActionSetTc().GetUint()) << 2})).Build())
}
if req.ActionSetAclMetaData != nil {
if req.ActionSetAclMetaData != nil && req.ActionSetAclMetaData.GetEnable() {
aReq.Actions = append(aReq.Actions,
fwdconfig.Action(fwdconfig.UpdateAction(fwdpb.UpdateType_UPDATE_TYPE_SET, fwdpb.PacketFieldNum_PACKET_FIELD_NUM_PACKET_ATTRIBUTE_32).
WithFieldIDInstance(aclMeta).
Expand All @@ -549,7 +549,7 @@ func (a *acl) appendAclEntryActions(ctx context.Context, req *saipb.CreateAclEnt
return err
}

if req.ActionPacketAction != nil {
if req.ActionPacketAction != nil && req.ActionPacketAction.GetEnable() {
aReq.Actions = append(aReq.Actions, computePacketAction(req.GetActionPacketAction().GetPacketAction()))
}
return nil
Expand Down
6 changes: 6 additions & 0 deletions dataplane/saiserver/acl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func TestCreateAclEntry(t *testing.T) {
req: &saipb.CreateAclEntryRequest{
TableId: proto.Uint64(2),
ActionSetOuterVlanPri: &saipb.AclActionData{
Enable: true,
Parameter: &saipb.AclActionData_Uint{Uint: 5},
},
},
Expand Down Expand Up @@ -254,6 +255,7 @@ func TestCreateAclEntry(t *testing.T) {
},
},
ActionSetVrf: &saipb.AclActionData{
Enable: true,
Parameter: &saipb.AclActionData_Oid{
Oid: 1,
},
Expand Down Expand Up @@ -304,6 +306,7 @@ func TestCreateAclEntry(t *testing.T) {
},
},
ActionSetUserTrapId: &saipb.AclActionData{
Enable: true,
Parameter: &saipb.AclActionData_Oid{
Oid: 1,
},
Expand Down Expand Up @@ -354,6 +357,7 @@ func TestCreateAclEntry(t *testing.T) {
},
},
ActionPacketAction: &saipb.AclActionData{
Enable: true,
Parameter: &saipb.AclActionData_PacketAction{
PacketAction: saipb.PacketAction_PACKET_ACTION_DROP,
},
Expand Down Expand Up @@ -401,6 +405,7 @@ func TestCreateAclEntry(t *testing.T) {
},
},
ActionPacketAction: &saipb.AclActionData{
Enable: true,
Parameter: &saipb.AclActionData_PacketAction{
PacketAction: saipb.PacketAction_PACKET_ACTION_FORWARD,
},
Expand Down Expand Up @@ -448,6 +453,7 @@ func TestCreateAclEntry(t *testing.T) {
},
},
ActionCounter: &saipb.AclActionData{
Enable: true,
Parameter: &saipb.AclActionData_Oid{
Oid: 10,
},
Expand Down
Loading