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

Similar to the previous commit, the Netlink interface of the OVS
conntrack module was restricted to global CAP_NET_ADMIN by using
GENL_ADMIN_PERM. This is changed to GENL_UNS_ADMIN_PERM to support
unprivileged containers in non-initial user namespace.

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

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 48e8f5c29b67eea5ffb617bc782c61a412e210f9..cb255d8ed99a9d28fd59f6d4d1245852781aac57 100644 (file)
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -1982,7 +1982,8 @@ static int ovs_ct_limit_set_zone_limit(struct nlattr *nla_zone_limit,
                } else {
                        struct ovs_ct_limit *ct_limit;
 
-                       ct_limit = kmalloc(sizeof(*ct_limit), GFP_KERNEL);
+                       ct_limit = kmalloc(sizeof(*ct_limit),
+                                          GFP_KERNEL_ACCOUNT);
                        if (!ct_limit)
                                return -ENOMEM;
 
@@ -2252,14 +2253,16 @@ exit_err:
 static const struct genl_small_ops ct_limit_genl_ops[] = {
        { .cmd = OVS_CT_LIMIT_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_ct_limit_cmd_set,
        },
        { .cmd = OVS_CT_LIMIT_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_ct_limit_cmd_del,
        },
        { .cmd = OVS_CT_LIMIT_CMD_GET,