diff options
| author |   Vlad Buslov <vladbu@mellanox.com> | 2019-04-01 14:16:59 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-02 13:20:30 -0700 |
| commit | 3eed52842b9fd291233c15f65fed34c5d3241183 (patch) | |
| tree | 015047dd3e14ceba29bb1b2714f439759d35061e /net/sched/cls_api.c | |
| parent | Merge branch 'net-phy-improve-genphy_c45_read_lpa' (diff) | |
| download | linux-dev-3eed52842b9fd291233c15f65fed34c5d3241183.tar.xz linux-dev-3eed52842b9fd291233c15f65fed34c5d3241183.zip | |
net: sched: don't set tunnel for decap action
Action tunnel_key doesn't have a metadata/tunnel for release(decap) action.
Drivers do not dereference entry->tunnel pointer for that action type, so
this behavior doesn't result in a crash at the moment. However, this needs
to be corrected as a preparation for updating hardware offloads API to not
rely on rtnl lock, for which flow_action code will copy the tunnel data to
temporary buffer to prevent concurrent action overwrite from
invalidating/freeing it.
Fixes: 3a7b68617de7 ("cls_api: add translator to flow_action representation")
Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/cls_api.c')
| -rw-r--r-- | net/sched/cls_api.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 99ae30c177c7..9115f053883f 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -3229,7 +3229,6 @@ int tc_setup_flow_action(struct flow_action *flow_action, entry->tunnel = tcf_tunnel_info(act); } else if (is_tcf_tunnel_release(act)) { entry->id = FLOW_ACTION_TUNNEL_DECAP; - entry->tunnel = tcf_tunnel_info(act); } else if (is_tcf_pedit(act)) { for (k = 0; k < tcf_pedit_nkeys(act); k++) { switch (tcf_pedit_cmd(act, k)) { |