diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-05-03 20:54:53 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-05-03 20:55:24 +0700 |
| commit | f661100a75d28ad9ec0f3e9015794ffd69846f35 (patch) | |
| tree | 48427299951fb2ea802b3ae66921a2d0e16948da /net/unix/af_unix.c | |
| parent | 8966a0af43e954331e92bb53b9c09111d01117b8 (diff) | |
| parent | 27a2f7c50c87691fa4b6a0a8a77f779b8bbe648c (diff) | |
| download | kernel_samsung_aries-f661100a75d28ad9ec0f3e9015794ffd69846f35.zip kernel_samsung_aries-f661100a75d28ad9ec0f3e9015794ffd69846f35.tar.gz kernel_samsung_aries-f661100a75d28ad9ec0f3e9015794ffd69846f35.tar.bz2 | |
Merge 3.0.76
Change-Id: I1fb9ef4b7481a3eefcf1f5a8beae8a69bf3de879
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index afbdd0c..709400b 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1940,7 +1940,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock, skb_queue_head(&sk->sk_receive_queue, skb); break; } - } else { + } else if (test_bit(SOCK_PASSCRED, &sock->flags)) { /* Copy credentials */ scm_set_cred(siocb->scm, UNIXCB(skb).pid, UNIXCB(skb).cred); check_creds = 1; |