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

Commit cabcac0b authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[BONDING]: Remove CAP_NET_ADMIN requirement for INFOQUERY ioctl 



This information is already available via /proc/net/bonding/*
therefore it doesn't make sense to require CAP_NET_ADMIN
privileges.

Original patch by Laurent Deniel <laurent.deniel@free.fr>

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8798b3fb

net/core/dev.c

+3 −2
Original line number Diff line number Diff line
@@ -2543,13 +2543,14 @@ int dev_ioctl(unsigned int cmd, void __user *arg) 
		case SIOCBONDENSLAVE:

		case SIOCBONDRELEASE:

		case SIOCBONDSETHWADDR:

		case SIOCBONDSLAVEINFOQUERY:

		case SIOCBONDINFOQUERY:

		case SIOCBONDCHANGEACTIVE:

		case SIOCBRADDIF:

		case SIOCBRDELIF:

			if (!capable(CAP_NET_ADMIN))

				return -EPERM;

			/* fall through */

		case SIOCBONDSLAVEINFOQUERY:

		case SIOCBONDINFOQUERY:

			dev_load(ifr.ifr_name);

			rtnl_lock();

			ret = dev_ifsioc(&ifr, cmd);