net: openvswitch: allow metering in non-initial user namespace

The Netlink interface for metering was restricted to global CAP_NET_ADMIN
by using GENL_ADMIN_PERM. To allow metring in a non-inital user namespace,
e.g., a container, this is changed to GENL_UNS_ADMIN_PERM.

Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 51111a9009bdb73009b3103c05723042f823716e..6e38f68f88c26ca6ef9e0f817efa6c42aff595bd 100644 (file)
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -343,7 +343,7 @@ static struct dp_meter *dp_meter_create(struct nlattr **a)
                        return ERR_PTR(-EINVAL);
 
        /* Allocate and set up the meter before locking anything. */
-       meter = kzalloc(struct_size(meter, bands, n_bands), GFP_KERNEL);
+       meter = kzalloc(struct_size(meter, bands, n_bands), GFP_KERNEL_ACCOUNT);
        if (!meter)
                return ERR_PTR(-ENOMEM);
 
@@ -687,9 +687,9 @@ static const struct genl_small_ops dp_meter_genl_ops[] = {
        },
        { .cmd = OVS_METER_CMD_SET,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN
-                                          *  privilege.
-                                          */
+               .flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN
+                                              *  privilege.
+                                              */
                .doit = ovs_meter_cmd_set,
        },
        { .cmd = OVS_METER_CMD_GET,
@@ -699,9 +699,9 @@ static const struct genl_small_ops dp_meter_genl_ops[] = {
        },
        { .cmd = OVS_METER_CMD_DEL,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-               .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN
-                                          *  privilege.
-                                          */
+               .flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN
+                                              *  privilege.
+                                              */
                .doit = ovs_meter_cmd_del
        },
 };