shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

network: refuse empty or numeric route table names

Browse Source
This commit is contained in:
Yu Watanabe 2021-12-09 05:50:01 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 283f7c9872
commit d2d602f4b4
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/network/networkd-route-util.c
View File

@ -360,9 +360,19 @@ int config_parse_route_table_names(
*num++ = '\0'; *num++ = '\0';
if (isempty(name)) {
log_syntax(unit, LOG_WARNING, filename, line, 0,
"Route table name cannot be empty. Ignoring assignment: %s:%s", name, num);
continue;
}
if (in_charset(name, DIGITS)) {
log_syntax(unit, LOG_WARNING, filename, line, 0,
"Route table name cannot be numeric. Ignoring assignment: %s:%s", name, num);
continue;
}
if (STR_IN_SET(name, "default", "main", "local")) { if (STR_IN_SET(name, "default", "main", "local")) {
log_syntax(unit, LOG_WARNING, filename, line, 0, log_syntax(unit, LOG_WARNING, filename, line, 0,
"Route table name %s already predefined. Ignoring assignment: %s:%s", name, name, num); "Route table name %s is already predefined. Ignoring assignment: %s:%s", name, name, num);
continue; continue;
} }

6
src/network/test-network.c
View File

@ -146,6 +146,12 @@ static void test_route_tables(Manager *manager) {
assert_se(!manager->route_table_names_by_number); assert_se(!manager->route_table_names_by_number);
assert_se(!manager->route_table_numbers_by_name); assert_se(!manager->route_table_numbers_by_name);
/* Invalid pairs */
assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "main:123 default:333 local:999", manager, manager) >= 0);
assert_se(config_parse_route_table_names("manager", "filename", 1, "section", 1, "RouteTable", 0, "1234:321 :567 hoge:foo aaa:-888", manager, manager) >= 0);
assert_se(!manager->route_table_names_by_number);
assert_se(!manager->route_table_numbers_by_name);
test_route_tables_one(manager, "default", 253); test_route_tables_one(manager, "default", 253);
test_route_tables_one(manager, "main", 254); test_route_tables_one(manager, "main", 254);
test_route_tables_one(manager, "local", 255); test_route_tables_one(manager, "local", 255);