src: disallow burst 0 in ratelimits
Pablo Neira Ayuso
maintainerPATCH v2 1/1 src: disallow burst 0 in ratelimits
The ratelimiter in nftables is similar to the one in iptables, and iptables disallows a zero burst.
Update the byte rate limiter not to print burst 5 (default value).
Update tests/py to use burst 5 instead of zero.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: update tests/py
do not print default burst when listing
doc/statements.txt | 3 ++- src/parser_bison.y | 25 ++++++++++++++++++-- src/statement.c | 2 +- tests/py/any/limit.t.payload | 44 ++++++++++++++++++------------------ 4 files changed, 48 insertions(+), 26 deletions(-)
doc/statements.txt +2 -1
@@ -324,7 +324,8 @@ ____ A limit statement matches at a limited rate using a token bucket filter. A rule using this statement will match until this limit is reached. It can be used in combination with the log statement to give limited logging. The optional -*over* keyword makes it match over the specified rate. +*over* keyword makes it match over the specified rate. Default *burst* is 5. +if you specify *burst*, it must be non-zero value. .limit statement values [options="header"]
src/parser_bison.y +23 -2
@@ -3038,6 +3038,11 @@ log_flag_tcp : SEQUENCE limit_stmt : LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts { + if ($7 == 0) { + erec_queue(error(&@7, "limit burst must be > 0"), + state->msgs); + YYERROR; + } $$ = limit_stmt_alloc(&@$); $$->limit.rate = $4; $$->limit.unit = $6;
@@ -3050,6 +3055,12 @@ limit_stmt : LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts struct error_record *erec; uint64_t rate, unit; + if ($6 == 0) { + erec_queue(error(&@6, "limit burst must be > 0"), + state->msgs); + YYERROR; + } + erec = rate_parse(&@$, $5, &rate, &unit); xfree($5); if (erec != NULL) {
@@ -3126,11 +3137,11 @@ limit_mode : OVER { $$ = NFT_LIMIT_F_INV; } | /* empty */ { $$ = 0; } ; -limit_burst_pkts : /* empty */ { $$ = 0; } +limit_burst_pkts : /* empty */ { $$ = 5; } | BURST NUM PACKETS { $$ = $2; } ; -limit_burst_bytes : /* empty */ { $$ = 0; } +limit_burst_bytes : /* empty */ { $$ = 5; } | BURST NUM BYTES { $$ = $2; } | BURST NUM STRING {
@@ -4121,6 +4132,11 @@ set_elem_stmt : COUNTER } | LIMIT RATE limit_mode NUM SLASH time_unit limit_burst_pkts { + if ($7 == 0) { + erec_queue(error(&@7, "limit burst must be > 0"), + state->msgs); + YYERROR; + } $$ = limit_stmt_alloc(&@$); $$->limit.rate = $4; $$->limit.unit = $6;
@@ -4133,6 +4149,11 @@ set_elem_stmt : COUNTER struct error_record *erec; uint64_t rate, unit; + if ($6 == 0) { + erec_queue(error(&@6, "limit burst must be > 0"), + state->msgs); + YYERROR; + } erec = rate_parse(&@$, $5, &rate, &unit); xfree($5); if (erec != NULL) {
src/statement.c +1 -1
@@ -464,7 +464,7 @@ static void limit_stmt_print(const struct stmt *stmt, struct output_ctx *octx)nft_print (octx,"limit rate %s%" PRIu64" %s/%s" , inv ?"over " :"" , rate, data_unit,get_unit (stmt->limit.unit)); -if (stmt->limit.burst >0 ) { +if (stmt->limit.burst !=5 ) {uint64_t burst; data_unit =get_rate (stmt->limit.burst, &burst);
tests/py/any/limit.t.payload +22 -22
121 lines not on this page · raw message
Signature · 1 line
2.20.1