mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michael Weiß
2022-09-23 15:38:19 +02:00
committed by Paolo Abeni
parent 6627a2074d
commit 8039371847
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/openvswitch/meter.c
View File

@@ -343,7 +343,7 @@ static struct dp_meter *dp_meter_create(struct nlattr **a)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
/* Allocate and set up the meter before locking anything. */ /* 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) if (!meter)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@@ -687,7 +687,7 @@ static const struct genl_small_ops dp_meter_genl_ops[] = {
}, },
{ .cmd = OVS_METER_CMD_SET, { .cmd = OVS_METER_CMD_SET,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN .flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN
* privilege. * privilege.
*/ */
.doit = ovs_meter_cmd_set, .doit = ovs_meter_cmd_set,
@@ -699,7 +699,7 @@ static const struct genl_small_ops dp_meter_genl_ops[] = {
}, },
{ .cmd = OVS_METER_CMD_DEL, { .cmd = OVS_METER_CMD_DEL,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
.flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN .flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN
* privilege. * privilege.
*/ */
.doit = ovs_meter_cmd_del .doit = ovs_meter_cmd_del