Commit 80393718 authored by Michael Weiß's avatar Michael Weiß Committed by Paolo Abeni
Browse files

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: default avatarMichael Weiß <michael.weiss@aisec.fraunhofer.de>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 6627a207

net/openvswitch/meter.c

+7 −7
Original line number Diff line number Diff line
@@ -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,7 +687,7 @@ 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

		.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN

					       *  privilege.

					       */

		.doit = ovs_meter_cmd_set,
@@ -699,7 +699,7 @@ 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

		.flags = GENL_UNS_ADMIN_PERM, /* Requires CAP_NET_ADMIN

					       *  privilege.

					       */

		.doit = ovs_meter_cmd_del