Skip to content

Fix the stack-overflow issue in AclOrch::getTableById() #1073

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
lguohan merged 2 commits into from
Jan 29, 2020
Merged

Fix the stack-overflow issue in AclOrch::getTableById() #1073

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a54b87
Fix the stack-overflow issue in AclOrch::getTableById()
zhenggen-xu Sep 28, 2019
3bd1cee
Skip the acl rules with empty tables and added log messages
zhenggen-xu Sep 29, 2019
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
13 changes: 13 additions & 0 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2724,6 +2724,13 @@ void AclOrch::doAclRuleTask(Consumer &consumer)
string op = kfvOp(t);

SWSS_LOG_INFO("OP: %s, TABLE_ID: %s, RULE_ID: %s", op.c_str(), table_id.c_str(), rule_id.c_str());

if (table_id.empty())
{
SWSS_LOG_WARN("ACL rule with RULE_ID: %s is not valid as TABLE_ID is empty", rule_id.c_str());
it = consumer.m_toSync.erase(it);
continue;
}

if (op == SET_COMMAND)
{
Expand Down Expand Up @@ -2913,6 +2920,12 @@ sai_object_id_t AclOrch::getTableById(string table_id)
{
SWSS_LOG_ENTER();

if (table_id.empty())
{
SWSS_LOG_WARN("table_id is empty");
return SAI_NULL_OBJECT_ID;
}

for (auto it : m_AclTables)
{
if (it.second.id == table_id)
Expand Down