diff options
| author | Adi Nissim <adin@mellanox.com> | 2018-12-02 13:55:21 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-05 05:53:37 +0100 |
| commit | 1c25324caf8292573b2b519fa4957baefd0c9657 (patch) | |
| tree | 7aec40872e97462a29f78bd46dec8e7ee01e0eb4 /net/sched | |
| parent | net/sched: act_tunnel_key: Allow key-less tunnels (diff) | |
| download | linux-1c25324caf8292573b2b519fa4957baefd0c9657.tar.xz linux-1c25324caf8292573b2b519fa4957baefd0c9657.zip | |
net/sched: act_tunnel_key: Don't dump dst port if it wasn't set
It's possible to set a tunnel without a destination port. However,
on dump(), a zero dst port is returned to user space even if it was not
set, fix that.
Note that so far it wasn't required, b/c key less tunnels were not
supported and the UDP tunnels do require destination port.
Signed-off-by: Adi Nissim <adin@mellanox.com>
Reviewed-by: Oz Shlomo <ozsh@mellanox.com>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/act_tunnel_key.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c index fad438c0f7a7..c3b90fadaff6 100644 --- a/net/sched/act_tunnel_key.c +++ b/net/sched/act_tunnel_key.c @@ -512,7 +512,9 @@ static int tunnel_key_dump(struct sk_buff *skb, struct tc_action *a, nla_put_be32(skb, TCA_TUNNEL_KEY_ENC_KEY_ID, key_id)) || tunnel_key_dump_addresses(skb, ¶ms->tcft_enc_metadata->u.tun_info) || - nla_put_be16(skb, TCA_TUNNEL_KEY_ENC_DST_PORT, key->tp_dst) || + (key->tp_dst && + nla_put_be16(skb, TCA_TUNNEL_KEY_ENC_DST_PORT, + key->tp_dst)) || nla_put_u8(skb, TCA_TUNNEL_KEY_NO_CSUM, !(key->tun_flags & TUNNEL_CSUM)) || tunnel_key_opts_dump(skb, info)) |