netlink: make nla_nest_start() add NLA_F_NESTED flag

Even if the NLA_F_NESTED flag was introduced more than 11 years ago, most
netlink based interfaces (including recently added ones) are still not
setting it in kernel generated messages. Without the flag, message parsers
not aware of attribute semantics (e.g. wireshark dissector or libmnl's
mnl_nlmsg_fprintf()) cannot recognize nested attributes and won't display
the structure of their contents.

Unfortunately we cannot just add the flag everywhere as there may be
userspace applications which check nlattr::nla_type directly rather than
through a helper masking out the flags. Therefore the patch renames
nla_nest_start() to nla_nest_start_noflag() and introduces nla_nest_start()
as a wrapper adding NLA_F_NESTED. The calls which add NLA_F_NESTED manually
are rewritten to use nla_nest_start().

Except for changes in include/net/netlink.h, the patch was generated using
this semantic patch:

@@ expression E1, E2; @@
-nla_nest_start(E1, E2)
+nla_nest_start_noflag(E1, E2)

@@ expression E1, E2; @@
-nla_nest_start_noflag(E1, E2 | NLA_F_NESTED)
+nla_nest_start(E1, E2)

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 0be3d097ae01..fdc8be7fd8f3 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -127,7 +127,7 @@ static int ovs_meter_cmd_reply_stats(struct sk_buff *reply, u32 meter_id,
                               OVS_METER_ATTR_PAD))
                 goto error;
 
-        nla = nla_nest_start(reply, OVS_METER_ATTR_BANDS);
+        nla = nla_nest_start_noflag(reply, OVS_METER_ATTR_BANDS);
         if (!nla)
                 goto error;
 
@@ -136,7 +136,7 @@ static int ovs_meter_cmd_reply_stats(struct sk_buff *reply, u32 meter_id,
         for (i = 0; i < meter->n_bands; ++i, ++band) {
                 struct nlattr *band_nla;
 
-                band_nla = nla_nest_start(reply, OVS_BAND_ATTR_UNSPEC);
+                band_nla = nla_nest_start_noflag(reply, OVS_BAND_ATTR_UNSPEC);
                 if (!band_nla || nla_put(reply, OVS_BAND_ATTR_STATS,
                                          sizeof(struct ovs_flow_stats),
                                          &band->stats))
@@ -166,11 +166,11 @@ static int ovs_meter_cmd_features(struct sk_buff *skb, struct genl_info *info)
             nla_put_u32(reply, OVS_METER_ATTR_MAX_BANDS, DP_MAX_BANDS))
                 goto nla_put_failure;
 
-        nla = nla_nest_start(reply, OVS_METER_ATTR_BANDS);
+        nla = nla_nest_start_noflag(reply, OVS_METER_ATTR_BANDS);
         if (!nla)
                 goto nla_put_failure;
 
-        band_nla = nla_nest_start(reply, OVS_BAND_ATTR_UNSPEC);
+        band_nla = nla_nest_start_noflag(reply, OVS_BAND_ATTR_UNSPEC);
         if (!band_nla)
                 goto nla_put_failure;
         /* Currently only DROP band type is supported. */