Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb12b8b2 authored by Gao feng's avatar Gao feng Committed by David S. Miller
Browse files

netns: ebtable: allow unprivileged users to operate ebtables 



ebt_table is a private resource of netns, operating ebtables
in one netns will not affect other netns, we can allow the
creator user of userns and netns to change the ebtables.

Signed-off-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c5c35108

net/bridge/netfilter/ebtables.c

+14 −10
Original line number Original line Diff line number Diff line
@@ -1472,16 +1472,17 @@ static int do_ebt_set_ctl(struct sock *sk, 
	int cmd, void __user *user, unsigned int len)

	int cmd, void __user *user, unsigned int len)

{

{

	int ret;

	int ret;

	struct net *net = sock_net(sk);





	if (!capable(CAP_NET_ADMIN))

	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;

		return -EPERM;





	switch(cmd) {

	switch(cmd) {

	case EBT_SO_SET_ENTRIES:

	case EBT_SO_SET_ENTRIES:

		ret = do_replace(sock_net(sk), user, len);

		ret = do_replace(net, user, len);

		break;

		break;

	case EBT_SO_SET_COUNTERS:

	case EBT_SO_SET_COUNTERS:

		ret = update_counters(sock_net(sk), user, len);

		ret = update_counters(net, user, len);

		break;

		break;

	default:

	default:

		ret = -EINVAL;

		ret = -EINVAL;
@@ -1494,14 +1495,15 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) 
	int ret;

	int ret;

	struct ebt_replace tmp;

	struct ebt_replace tmp;

	struct ebt_table *t;

	struct ebt_table *t;

	struct net *net = sock_net(sk);





	if (!capable(CAP_NET_ADMIN))

	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;

		return -EPERM;





	if (copy_from_user(&tmp, user, sizeof(tmp)))

	if (copy_from_user(&tmp, user, sizeof(tmp)))

		return -EFAULT;

		return -EFAULT;





	t = find_table_lock(sock_net(sk), tmp.name, &ret, &ebt_mutex);

	t = find_table_lock(net, tmp.name, &ret, &ebt_mutex);

	if (!t)

	if (!t)

		return ret;

		return ret;
@@ -2279,16 +2281,17 @@ static int compat_do_ebt_set_ctl(struct sock *sk, 
		int cmd, void __user *user, unsigned int len)

		int cmd, void __user *user, unsigned int len)

{

{

	int ret;

	int ret;

	struct net *net = sock_net(sk);





	if (!capable(CAP_NET_ADMIN))

	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;

		return -EPERM;





	switch (cmd) {

	switch (cmd) {

	case EBT_SO_SET_ENTRIES:

	case EBT_SO_SET_ENTRIES:

		ret = compat_do_replace(sock_net(sk), user, len);

		ret = compat_do_replace(net, user, len);

		break;

		break;

	case EBT_SO_SET_COUNTERS:

	case EBT_SO_SET_COUNTERS:

		ret = compat_update_counters(sock_net(sk), user, len);

		ret = compat_update_counters(net, user, len);

		break;

		break;

	default:

	default:

		ret = -EINVAL;

		ret = -EINVAL;
@@ -2302,8 +2305,9 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd, 
	int ret;

	int ret;

	struct compat_ebt_replace tmp;

	struct compat_ebt_replace tmp;

	struct ebt_table *t;

	struct ebt_table *t;

	struct net *net = sock_net(sk);





	if (!capable(CAP_NET_ADMIN))

	if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

		return -EPERM;

		return -EPERM;





	/* try real handler in case userland supplied needed padding */

	/* try real handler in case userland supplied needed padding */
@@ -2314,7 +2318,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd, 
	if (copy_from_user(&tmp, user, sizeof(tmp)))

	if (copy_from_user(&tmp, user, sizeof(tmp)))

		return -EFAULT;

		return -EFAULT;





	t = find_table_lock(sock_net(sk), tmp.name, &ret, &ebt_mutex);

	t = find_table_lock(net, tmp.name, &ret, &ebt_mutex);

	if (!t)

	if (!t)

		return ret;

		return ret;