From: Davide Caratti Date: Tue, 4 Jun 2019 22:30:16 +0000 (+0200) Subject: tc: simple: don't hardcode the control action X-Git-Tag: v5.2.0~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ee4d17954f665276e9216c0ec7650ff74b0709d;p=thirdparty%2Fiproute2.git tc: simple: don't hardcode the control action the following TDC test case: b776 - Replace simple action with invalid goto chain control checks if the kernel correctly validates the 'goto chain' control action, when it is specified in 'act_simple' rules. The test systematically fails because the control action is hardcoded in parse_simple(), i.e. it is not parsed by command line arguments, so its value is constantly TC_ACT_PIPE. Because of that, the following command: # tc action add action simple sdata "test" drop index 7 installs an 'act_simple' rule that never drops packets, and whose 'index' is the first IDR available, plus an 'act_gact' rule with 'index' equal to 7, that drops packets. Use parse_action_control_dflt(), like we did on many other TC actions, to make the control action configurable also with 'act_simple'. The expected results of test b776 are summarized below: iproute2 v kernel->| 5.1-rc2 (and previous) | 5.1-rc3 (and subsequent) ------------------+-------------------------+------------------------- 5.1.0 | FAIL (bad IDR) | FAIL (bad IDR) 5.1.0(patched) | FAIL (no rule/bad sdata)| PASS Changes since v1: - reword commit message, thanks Stephen Hemminger Fixes: 087f46ee4ebd ("tc: introduce simple action") CC: Andrea Claudi CC: Marcelo Ricardo Leitner Signed-off-by: Davide Caratti Signed-off-by: Stephen Hemminger --- diff --git a/tc/m_simple.c b/tc/m_simple.c index 886606f9f..e3c8a60ff 100644 --- a/tc/m_simple.c +++ b/tc/m_simple.c @@ -119,6 +119,9 @@ parse_simple(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, } } + parse_action_control_dflt(&argc, &argv, &sel.action, false, + TC_ACT_PIPE); + if (argc) { if (matches(*argv, "index") == 0) { NEXT_ARG(); @@ -144,8 +147,6 @@ parse_simple(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, return -1; } - sel.action = TC_ACT_PIPE; - tail = addattr_nest(n, MAX_MSG, tca_id); addattr_l(n, MAX_MSG, TCA_DEF_PARMS, &sel, sizeof(sel)); if (simpdata)