summary refs log tree commit diff
path: root/net
diff options
context:
space:
mode:
authorMike Pecovnik <mike.pecovnik@gmail.com>2014-02-24 21:11:16 +0100
committerDavid S. Miller <davem@davemloft.net>2014-02-25 18:35:14 -0500
commit46833a86f7ab30101096d81117dd250bfae74c6f (patch)
tree916be8a6ddfe6d2c6cdccb93d6c752927c16854b /net
parent687d705c031916b83953b714917b04d899e23cf5 (diff)
downloadlinux-46833a86f7ab30101096d81117dd250bfae74c6f.tar.gz
net: Fix permission check in netlink_connect()
netlink_sendmsg() was changed to prevent non-root processes from sending
messages with dst_pid != 0.
netlink_connect() however still only checks if nladdr->nl_groups is set.
This patch modifies netlink_connect() to check for the same condition.

Signed-off-by: Mike Pecovnik <mike.pecovnik@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/netlink/af_netlink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index fdf51353cf78..04748ab649c2 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1489,8 +1489,8 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr,
 	if (addr->sa_family != AF_NETLINK)
 		return -EINVAL;
 
-	/* Only superuser is allowed to send multicasts */
-	if (nladdr->nl_groups && !netlink_capable(sock, NL_CFG_F_NONROOT_SEND))
+	if ((nladdr->nl_groups || nladdr->nl_pid) &&
+	    !netlink_capable(sock, NL_CFG_F_NONROOT_SEND))
 		return -EPERM;
 
 	if (!nlk->portid)