mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
Revert "af_unix: dont send SCM_CREDENTIAL when dest socket is NULL"
This reverts commit 14134f6584
.
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>
This commit is contained in:
parent
4de79c737b
commit
25da0e3e9d
1 changed files with 2 additions and 2 deletions
|
@ -1412,8 +1412,8 @@ static void maybe_add_creds(struct sk_buff *skb, const struct socket *sock,
|
||||||
if (UNIXCB(skb).cred)
|
if (UNIXCB(skb).cred)
|
||||||
return;
|
return;
|
||||||
if (test_bit(SOCK_PASSCRED, &sock->flags) ||
|
if (test_bit(SOCK_PASSCRED, &sock->flags) ||
|
||||||
(other->sk_socket &&
|
!other->sk_socket ||
|
||||||
test_bit(SOCK_PASSCRED, &other->sk_socket->flags))) {
|
test_bit(SOCK_PASSCRED, &other->sk_socket->flags)) {
|
||||||
UNIXCB(skb).pid = get_pid(task_tgid(current));
|
UNIXCB(skb).pid = get_pid(task_tgid(current));
|
||||||
UNIXCB(skb).cred = get_current_cred();
|
UNIXCB(skb).cred = get_current_cred();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue