| Message ID | 20220911173825.167352-2-michael.weiss@aisec.fraunhofer.de (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: openvswitch: metering and conntrack in userns | expand |
On Sun, 2022-09-11 at 19:38 +0200, Michael Weiß wrote: > 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> > --- > net/openvswitch/meter.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c > index 04a060ac7fdf..e9ef050a0dd5 100644 > --- a/net/openvswitch/meter.c > +++ b/net/openvswitch/meter.c > @@ -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 > }, > }; It looks like the user namespace can allocate quite a bit of memory with multiple meters, I think it's better additionally change GFP_KERNEL to GFP_KERNEL_ACCOUNT in dp_meter_create(). Also plese add an explicit target tree in the subj when posting the next revision, thanks! Paolo
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c index 04a060ac7fdf..e9ef050a0dd5 100644 --- a/net/openvswitch/meter.c +++ b/net/openvswitch/meter.c @@ -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 }, };
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> --- net/openvswitch/meter.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)