From 6707c76a91282938662b3a6d79caeb4789884634 Mon Sep 17 00:00:00 2001 From: dingtianhong Date: Mon, 25 Mar 2013 17:02:04 +0000 Subject: [PATCH] --- yaml --- r: 361849 b: refs/heads/master c: 14134f6584212d585b310ce95428014b653dfaf6 h: refs/heads/master i: 361847: 6149277bcc2d1b7751d777c52fd8a7fdfe162737 v: v3 --- [refs] | 2 +- trunk/net/unix/af_unix.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3a9e16d47fa8..f11bd5b965ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 465c0a165938992455357982d7f15ac105528b4a +refs/heads/master: 14134f6584212d585b310ce95428014b653dfaf6 diff --git a/trunk/net/unix/af_unix.c b/trunk/net/unix/af_unix.c index f153a8d6e339..971282b6f6a3 100644 --- a/trunk/net/unix/af_unix.c +++ b/trunk/net/unix/af_unix.c @@ -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(); }