Fix cred leak in AF_NETLINK

Patch cab9e9848b9a8283b0504a2d7c435a9f5ba026de to the 2.6.35.y stable tree
stored a ref to the current cred struct in struct scm_cookie.  This was fine
with AF_UNIX as that calls scm_destroy() from its packet sending functions, but
AF_NETLINK, which also uses scm_send(), does not call scm_destroy() - meaning
that the copied credentials leak each time SCM data is sent over a netlink
socket.

This can be triggered quite simply on a Fedora 13 or 14 userspace with the
2.6.35.11 kernel (or something based off of that) by calling:

	#!/bin/bash
	for ((i=0; i<100; i++))
	do
		su - -c /bin/true
		cut -d: -f1 /proc/slabinfo | grep 'cred\|key\|task_struct'
		cat /proc/keys | wc -l
	done

This leaks the session key that pam_keyinit creates for 'su -', which appears
in /proc/keys as being revoked (has the R flag set against it) afterward su is
called.

Furthermore, if CONFIG_SLAB=y, then the cred and key slab object usage counts
can be viewed and seen to increase.  The key slab increases by one object per
loop, and this can be seen after the system has had a couple of minutes to
stand after the script above has been run on it.

If the system is working correctly, the key and cred counts should return to
roughly what they were before.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 54d73083cb2ac445abde6ae0c27bf71d9eae0ff2..56ed59eea69cb8347fb3f5615a19931dcee88276 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -1330,12 +1330,16 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
                return err;
 
        if (msg->msg_namelen) {
-               if (addr->nl_family != AF_NETLINK)
-                       return -EINVAL;
+               if (addr->nl_family != AF_NETLINK) {
+                       err = -EINVAL;
+                       goto out;
+               }
                dst_pid = addr->nl_pid;
                dst_group = ffs(addr->nl_groups);
-               if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND))
-                       return -EPERM;
+               if (dst_group && !netlink_capable(sock, NL_NONROOT_SEND)) {
+                       err = -EPERM;
+                       goto out;
+               }
        } else {
                dst_pid = nlk->dst_pid;
                dst_group = nlk->dst_group;
@@ -1387,6 +1391,8 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock,
        err = netlink_unicast(sk, skb, dst_pid, msg->msg_flags&MSG_DONTWAIT);
 
 out:
+       scm_destroy(siocb->scm);
+       siocb->scm = NULL;
        return err;
 }