Commit 5187cd05 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

netlink: Rename netlink_capable netlink_allowed 



netlink_capable is a static internal function in af_netlink.c and we
have better uses for the name netlink_capable.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 98a46d46

net/netlink/af_netlink.c

+5 −5
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static int netlink_autobind(struct socket *sock) 
	return err;

}



static inline int netlink_capable(const struct socket *sock, unsigned int flag)

static inline int netlink_allowed(const struct socket *sock, unsigned int flag)

{

	return (nl_table[sock->sk->sk_protocol].flags & flag) ||

		ns_capable(sock_net(sock->sk)->user_ns, CAP_NET_ADMIN);
@@ -1428,7 +1428,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr, 


	/* Only superuser is allowed to listen multicasts */

	if (nladdr->nl_groups) {

		if (!netlink_capable(sock, NL_CFG_F_NONROOT_RECV))

		if (!netlink_allowed(sock, NL_CFG_F_NONROOT_RECV))

			return -EPERM;

		err = netlink_realloc_groups(sk);

		if (err)
@@ -1490,7 +1490,7 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr, 
		return -EINVAL;



	if ((nladdr->nl_groups || nladdr->nl_pid) &&

	    !netlink_capable(sock, NL_CFG_F_NONROOT_SEND))

	    !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))

		return -EPERM;



	if (!nlk->portid)
@@ -2096,7 +2096,7 @@ static int netlink_setsockopt(struct socket *sock, int level, int optname, 
		break;

	case NETLINK_ADD_MEMBERSHIP:

	case NETLINK_DROP_MEMBERSHIP: {

		if (!netlink_capable(sock, NL_CFG_F_NONROOT_RECV))

		if (!netlink_allowed(sock, NL_CFG_F_NONROOT_RECV))

			return -EPERM;

		err = netlink_realloc_groups(sk);

		if (err)
@@ -2247,7 +2247,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, 
		dst_group = ffs(addr->nl_groups);

		err =  -EPERM;

		if ((dst_group || dst_portid) &&

		    !netlink_capable(sock, NL_CFG_F_NONROOT_SEND))

		    !netlink_allowed(sock, NL_CFG_F_NONROOT_SEND))

			goto out;

	} else {

		dst_portid = nlk->dst_portid;