Merge tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux

[linux.git] / net / openvswitch / meter.c

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 43849d752a1e72e5bcefa74d72ca78a84fd97a12..3323b79ff548dfbf7842b3ac3b825b7d0f7dcfde 100644 (file)
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2017 Nicira, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -127,7 +124,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 +133,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 +163,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. */
@@ -227,9 +224,9 @@ static struct dp_meter *dp_meter_create(struct nlattr **a)
                struct nlattr *attr[OVS_BAND_ATTR_MAX + 1];
                u32 band_max_delta_t;
 
-               err = nla_parse((struct nlattr **)&attr, OVS_BAND_ATTR_MAX,
-                               nla_data(nla), nla_len(nla), band_policy,
-                               NULL);
+               err = nla_parse_deprecated((struct nlattr **)&attr,
+                                          OVS_BAND_ATTR_MAX, nla_data(nla),
+                                          nla_len(nla), band_policy, NULL);
                if (err)
                        goto exit_free_meter;
 
@@ -526,27 +523,27 @@ bool ovs_meter_execute(struct datapath *dp, struct sk_buff *skb,
 
 static struct genl_ops dp_meter_genl_ops[] = {
        { .cmd = OVS_METER_CMD_FEATURES,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .flags = 0,               /* OK for unprivileged users. */
-               .policy = meter_policy,
                .doit = ovs_meter_cmd_features
        },
        { .cmd = OVS_METER_CMD_SET,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN
                                           *  privilege.
                                           */
-               .policy = meter_policy,
                .doit = ovs_meter_cmd_set,
        },
        { .cmd = OVS_METER_CMD_GET,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .flags = 0,               /* OK for unprivileged users. */
-               .policy = meter_policy,
                .doit = ovs_meter_cmd_get,
        },
        { .cmd = OVS_METER_CMD_DEL,
+               .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
                .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN
                                           *  privilege.
                                           */
-               .policy = meter_policy,
                .doit = ovs_meter_cmd_del
        },
 };
@@ -560,6 +557,7 @@ struct genl_family dp_meter_genl_family __ro_after_init = {
        .name = OVS_METER_FAMILY,
        .version = OVS_METER_VERSION,
        .maxattr = OVS_METER_ATTR_MAX,
+       .policy = meter_policy,
        .netnsok = true,
        .parallel_ops = true,
        .ops = dp_meter_genl_ops,