ip/tunnel: always print all known attributes

Presently, if a Geneve or VXLAN interface was created with 'external',
it's not possible for a user to determine e.g. the value of 'dstport'
after creation. This change fixes that by avoiding early returns.

This change partly reverts commit 00ff4b8e31af ("ip/tunnel: Be consistent
when printing tunnel collect metadata").

Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c
index 9299236cbd33a2fb92ae319dd09ed16932f41624..78fc818e0ad74ca48b793719afc2311994393499 100644 (file)
--- a/ip/iplink_geneve.c
+++ b/ip/iplink_geneve.c
@@ -243,7 +243,6 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
 
 static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 {
-       __u32 vni;
        __u8 ttl = 0;
        __u8 tos = 0;
 
@@ -252,15 +251,12 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
        if (tb[IFLA_GENEVE_COLLECT_METADATA]) {
                print_bool(PRINT_ANY, "external", "external ", true);
-               return;
        }
 
-       if (!tb[IFLA_GENEVE_ID] ||
-           RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) < sizeof(__u32))
-               return;
-
-       vni = rta_getattr_u32(tb[IFLA_GENEVE_ID]);
-       print_uint(PRINT_ANY, "id", "id %u ", vni);
+       if (tb[IFLA_GENEVE_ID] &&
+           RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) >= sizeof(__u32)) {
+               print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_GENEVE_ID]));
+       }
 
        if (tb[IFLA_GENEVE_REMOTE]) {
                __be32 addr = rta_getattr_u32(tb[IFLA_GENEVE_REMOTE]);

diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index bae9d99436e5a59ec73e66027bd7bc7ece488eb5..9afa3ccad11527a4a04408f596c6b59ab7f046ae 100644 (file)
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -408,7 +408,6 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
 
 static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 {
-       __u32 vni;
        __u8 ttl = 0;
        __u8 tos = 0;
        __u32 maxaddr;
@@ -419,15 +418,12 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        if (tb[IFLA_VXLAN_COLLECT_METADATA] &&
            rta_getattr_u8(tb[IFLA_VXLAN_COLLECT_METADATA])) {
                print_bool(PRINT_ANY, "external", "external ", true);
-               return;
        }
 
-       if (!tb[IFLA_VXLAN_ID] ||
-           RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) < sizeof(__u32))
-               return;
-
-       vni = rta_getattr_u32(tb[IFLA_VXLAN_ID]);
-       print_uint(PRINT_ANY, "id", "id %u ", vni);
+       if (tb[IFLA_VXLAN_ID] &&
+           RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) >= sizeof(__u32)) {
+               print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_VXLAN_ID]));
+       }
 
        if (tb[IFLA_VXLAN_GROUP]) {
                __be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_GROUP]);

diff --git a/ip/link_gre.c b/ip/link_gre.c
index 6d4a8be81da6ed1b6855a1342afe998fb722b68f..f462a227a5071f1db889e35ff4e69395e89b4ab0 100644 (file)
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -442,7 +442,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
        if (tb[IFLA_GRE_COLLECT_METADATA]) {
                print_bool(PRINT_ANY, "external", "external ", true);
-               return;
        }
 
        tnl_print_endpoint("remote", tb[IFLA_GRE_REMOTE], AF_INET);

diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index f33598af89897d40f5bacc6fd3ba34b718df7ca7..232d9bde24d948b3a1c919f75a68f16dc9a60eef 100644 (file)
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -461,7 +461,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
        if (tb[IFLA_GRE_COLLECT_METADATA]) {
                print_bool(PRINT_ANY, "external", "external ", true);
-               return;
        }
 
        if (tb[IFLA_GRE_FLAGS])

diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index c7b49b02aa099642b660a0377da87df978b899fd..2fcc13ef64d337d48bd54e111f13f2d41d80ef8f 100644 (file)
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -344,7 +344,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
 
        if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
                print_bool(PRINT_ANY, "external", "external ", true);
-               return;
        }
 
        if (tb[IFLA_IPTUN_FLAGS])

diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 636cdb2cf5bb7135ff4854047ea384b6b8d354f4..b25855ba20049b2b95290ba1b9c06f4a2671ba92 100644 (file)
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -368,7 +368,6 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
 
        if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
                print_bool(PRINT_ANY, "external", "external ", true);
-               return;
        }
 
        if (tb[IFLA_IPTUN_PROTO]) {