Commit 25da0e3e authored Apr 03, 2013 by Eric W. Biederman Committed by David S. Miller Apr 05, 2013

Revert "af_unix: dont send SCM_CREDENTIAL when dest socket is NULL"



This reverts commit 14134f65.

The problem that the above patch was meant to address is that af_unix
messages are not being coallesced because we are sending unnecesarry
credentials.  Not sending credentials in maybe_add_creds totally
breaks unconnected unix domain sockets that wish to send credentails
to other sockets.

In practice this break some versions of udev because they receive a
message and the sending uid is bogus so they drop the message.

Reported-by: Sven Joachim <svenjoac@gmx.de>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4de79c73

net/unix/af_unix.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1412,8 +1412,8 @@ static void maybe_add_creds(struct sk_buff skb, const struct socket sock,
		if (UNIXCB(skb).cred)
		return;
		if (test_bit(SOCK_PASSCRED, &sock->flags) \|\|
		(other->sk_socket &&
		test_bit(SOCK_PASSCRED, &other->sk_socket->flags))) {
		!other->sk_socket \|\|
		test_bit(SOCK_PASSCRED, &other->sk_socket->flags)) {
		UNIXCB(skb).pid = get_pid(task_tgid(current));
		UNIXCB(skb).cred = get_current_cred();
		}