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>
This commit is contained in:

committed by
David S. Miller

parent
c7881b4a97
commit
ae0be8de9a
@@ -1683,7 +1683,7 @@ static bool ovs_ct_nat_to_attr(const struct ovs_conntrack_info *info,
|
||||
{
|
||||
struct nlattr *start;
|
||||
|
||||
start = nla_nest_start(skb, OVS_CT_ATTR_NAT);
|
||||
start = nla_nest_start_noflag(skb, OVS_CT_ATTR_NAT);
|
||||
if (!start)
|
||||
return false;
|
||||
|
||||
@@ -1750,7 +1750,7 @@ int ovs_ct_action_to_attr(const struct ovs_conntrack_info *ct_info,
|
||||
{
|
||||
struct nlattr *start;
|
||||
|
||||
start = nla_nest_start(skb, OVS_ACTION_ATTR_CT);
|
||||
start = nla_nest_start_noflag(skb, OVS_ACTION_ATTR_CT);
|
||||
if (!start)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -2160,7 +2160,7 @@ static int ovs_ct_limit_cmd_get(struct sk_buff *skb, struct genl_info *info)
|
||||
if (IS_ERR(reply))
|
||||
return PTR_ERR(reply);
|
||||
|
||||
nla_reply = nla_nest_start(reply, OVS_CT_LIMIT_ATTR_ZONE_LIMIT);
|
||||
nla_reply = nla_nest_start_noflag(reply, OVS_CT_LIMIT_ATTR_ZONE_LIMIT);
|
||||
|
||||
if (a[OVS_CT_LIMIT_ATTR_ZONE_LIMIT]) {
|
||||
err = ovs_ct_limit_get_zone_limit(
|
||||
|
@@ -463,7 +463,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
|
||||
nla_data(upcall_info->userdata));
|
||||
|
||||
if (upcall_info->egress_tun_info) {
|
||||
nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_EGRESS_TUN_KEY);
|
||||
nla = nla_nest_start_noflag(user_skb,
|
||||
OVS_PACKET_ATTR_EGRESS_TUN_KEY);
|
||||
if (!nla) {
|
||||
err = -EMSGSIZE;
|
||||
goto out;
|
||||
@@ -475,7 +476,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
|
||||
}
|
||||
|
||||
if (upcall_info->actions_len) {
|
||||
nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_ACTIONS);
|
||||
nla = nla_nest_start_noflag(user_skb, OVS_PACKET_ATTR_ACTIONS);
|
||||
if (!nla) {
|
||||
err = -EMSGSIZE;
|
||||
goto out;
|
||||
@@ -776,7 +777,7 @@ static int ovs_flow_cmd_fill_actions(const struct sw_flow *flow,
|
||||
* This can only fail for dump operations because the skb is always
|
||||
* properly sized for single flows.
|
||||
*/
|
||||
start = nla_nest_start(skb, OVS_FLOW_ATTR_ACTIONS);
|
||||
start = nla_nest_start_noflag(skb, OVS_FLOW_ATTR_ACTIONS);
|
||||
if (start) {
|
||||
const struct sw_flow_actions *sf_acts;
|
||||
|
||||
|
@@ -856,7 +856,7 @@ static int vxlan_opt_to_nlattr(struct sk_buff *skb,
|
||||
const struct vxlan_metadata *opts = tun_opts;
|
||||
struct nlattr *nla;
|
||||
|
||||
nla = nla_nest_start(skb, OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS);
|
||||
nla = nla_nest_start_noflag(skb, OVS_TUNNEL_KEY_ATTR_VXLAN_OPTS);
|
||||
if (!nla)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -948,7 +948,7 @@ static int ip_tun_to_nlattr(struct sk_buff *skb,
|
||||
struct nlattr *nla;
|
||||
int err;
|
||||
|
||||
nla = nla_nest_start(skb, OVS_KEY_ATTR_TUNNEL);
|
||||
nla = nla_nest_start_noflag(skb, OVS_KEY_ATTR_TUNNEL);
|
||||
if (!nla)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -1957,7 +1957,7 @@ static int nsh_key_to_nlattr(const struct ovs_key_nsh *nsh, bool is_mask,
|
||||
{
|
||||
struct nlattr *start;
|
||||
|
||||
start = nla_nest_start(skb, OVS_KEY_ATTR_NSH);
|
||||
start = nla_nest_start_noflag(skb, OVS_KEY_ATTR_NSH);
|
||||
if (!start)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -2040,14 +2040,15 @@ static int __ovs_nla_put_key(const struct sw_flow_key *swkey,
|
||||
if (swkey->eth.vlan.tci || eth_type_vlan(swkey->eth.type)) {
|
||||
if (ovs_nla_put_vlan(skb, &output->eth.vlan, is_mask))
|
||||
goto nla_put_failure;
|
||||
encap = nla_nest_start(skb, OVS_KEY_ATTR_ENCAP);
|
||||
encap = nla_nest_start_noflag(skb, OVS_KEY_ATTR_ENCAP);
|
||||
if (!swkey->eth.vlan.tci)
|
||||
goto unencap;
|
||||
|
||||
if (swkey->eth.cvlan.tci || eth_type_vlan(swkey->eth.type)) {
|
||||
if (ovs_nla_put_vlan(skb, &output->eth.cvlan, is_mask))
|
||||
goto nla_put_failure;
|
||||
in_encap = nla_nest_start(skb, OVS_KEY_ATTR_ENCAP);
|
||||
in_encap = nla_nest_start_noflag(skb,
|
||||
OVS_KEY_ATTR_ENCAP);
|
||||
if (!swkey->eth.cvlan.tci)
|
||||
goto unencap;
|
||||
}
|
||||
@@ -2226,7 +2227,7 @@ int ovs_nla_put_key(const struct sw_flow_key *swkey,
|
||||
int err;
|
||||
struct nlattr *nla;
|
||||
|
||||
nla = nla_nest_start(skb, attr);
|
||||
nla = nla_nest_start_noflag(skb, attr);
|
||||
if (!nla)
|
||||
return -EMSGSIZE;
|
||||
err = __ovs_nla_put_key(swkey, output, is_mask, skb);
|
||||
@@ -3252,7 +3253,7 @@ static int sample_action_to_attr(const struct nlattr *attr,
|
||||
const struct sample_arg *arg;
|
||||
struct nlattr *actions;
|
||||
|
||||
start = nla_nest_start(skb, OVS_ACTION_ATTR_SAMPLE);
|
||||
start = nla_nest_start_noflag(skb, OVS_ACTION_ATTR_SAMPLE);
|
||||
if (!start)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -3265,7 +3266,7 @@ static int sample_action_to_attr(const struct nlattr *attr,
|
||||
goto out;
|
||||
}
|
||||
|
||||
ac_start = nla_nest_start(skb, OVS_SAMPLE_ATTR_ACTIONS);
|
||||
ac_start = nla_nest_start_noflag(skb, OVS_SAMPLE_ATTR_ACTIONS);
|
||||
if (!ac_start) {
|
||||
err = -EMSGSIZE;
|
||||
goto out;
|
||||
@@ -3291,7 +3292,7 @@ static int clone_action_to_attr(const struct nlattr *attr,
|
||||
struct nlattr *start;
|
||||
int err = 0, rem = nla_len(attr);
|
||||
|
||||
start = nla_nest_start(skb, OVS_ACTION_ATTR_CLONE);
|
||||
start = nla_nest_start_noflag(skb, OVS_ACTION_ATTR_CLONE);
|
||||
if (!start)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -3313,7 +3314,7 @@ static int check_pkt_len_action_to_attr(const struct nlattr *attr,
|
||||
const struct nlattr *a, *cpl_arg;
|
||||
int err = 0, rem = nla_len(attr);
|
||||
|
||||
start = nla_nest_start(skb, OVS_ACTION_ATTR_CHECK_PKT_LEN);
|
||||
start = nla_nest_start_noflag(skb, OVS_ACTION_ATTR_CHECK_PKT_LEN);
|
||||
if (!start)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -3332,8 +3333,8 @@ static int check_pkt_len_action_to_attr(const struct nlattr *attr,
|
||||
* 'OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_LESS_EQUAL'.
|
||||
*/
|
||||
a = nla_next(cpl_arg, &rem);
|
||||
ac_start = nla_nest_start(skb,
|
||||
OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_LESS_EQUAL);
|
||||
ac_start = nla_nest_start_noflag(skb,
|
||||
OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_LESS_EQUAL);
|
||||
if (!ac_start) {
|
||||
err = -EMSGSIZE;
|
||||
goto out;
|
||||
@@ -3351,8 +3352,8 @@ static int check_pkt_len_action_to_attr(const struct nlattr *attr,
|
||||
* OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_GREATER.
|
||||
*/
|
||||
a = nla_next(a, &rem);
|
||||
ac_start = nla_nest_start(skb,
|
||||
OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_GREATER);
|
||||
ac_start = nla_nest_start_noflag(skb,
|
||||
OVS_CHECK_PKT_LEN_ATTR_ACTIONS_IF_GREATER);
|
||||
if (!ac_start) {
|
||||
err = -EMSGSIZE;
|
||||
goto out;
|
||||
@@ -3386,7 +3387,7 @@ static int set_action_to_attr(const struct nlattr *a, struct sk_buff *skb)
|
||||
struct ovs_tunnel_info *ovs_tun = nla_data(ovs_key);
|
||||
struct ip_tunnel_info *tun_info = &ovs_tun->tun_dst->u.tun_info;
|
||||
|
||||
start = nla_nest_start(skb, OVS_ACTION_ATTR_SET);
|
||||
start = nla_nest_start_noflag(skb, OVS_ACTION_ATTR_SET);
|
||||
if (!start)
|
||||
return -EMSGSIZE;
|
||||
|
||||
@@ -3418,7 +3419,7 @@ static int masked_set_action_to_set_action_attr(const struct nlattr *a,
|
||||
/* Revert the conversion we did from a non-masked set action to
|
||||
* masked set action.
|
||||
*/
|
||||
nla = nla_nest_start(skb, OVS_ACTION_ATTR_SET);
|
||||
nla = nla_nest_start_noflag(skb, OVS_ACTION_ATTR_SET);
|
||||
if (!nla)
|
||||
return -EMSGSIZE;
|
||||
|
||||
|
@@ -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. */
|
||||
|
@@ -43,7 +43,7 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb)
|
||||
if (vxlan->cfg.flags & VXLAN_F_GBP) {
|
||||
struct nlattr *exts;
|
||||
|
||||
exts = nla_nest_start(skb, OVS_TUNNEL_ATTR_EXTENSION);
|
||||
exts = nla_nest_start_noflag(skb, OVS_TUNNEL_ATTR_EXTENSION);
|
||||
if (!exts)
|
||||
return -EMSGSIZE;
|
||||
|
||||
|
@@ -319,7 +319,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb)
|
||||
if (!vport->ops->get_options)
|
||||
return 0;
|
||||
|
||||
nla = nla_nest_start(skb, OVS_VPORT_ATTR_OPTIONS);
|
||||
nla = nla_nest_start_noflag(skb, OVS_VPORT_ATTR_OPTIONS);
|
||||
if (!nla)
|
||||
return -EMSGSIZE;
|
||||
|
||||
|
Reference in New Issue
Block a user