diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-21 12:56:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-21 12:56:52 +0000 |
| commit | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (patch) | |
| tree | 8158b4c88b59391274d539a7e8e6985446d900e7 /net/unix/af_unix.c | |
| parent | e64001e8efc107992fd835770f6383d0dc731594 (diff) | |
| parent | 254dc326dbfd23c2678fafad1b84fc0e42ac4374 (diff) | |
Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-arizona
Immutable branch for ASoC, as requested by Mark Brown
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 86de99ad297..c1f403bed68 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1246,6 +1246,15 @@ static int unix_socketpair(struct socket *socka, struct socket *sockb) return 0; } +static void unix_sock_inherit_flags(const struct socket *old, + struct socket *new) +{ + if (test_bit(SOCK_PASSCRED, &old->flags)) + set_bit(SOCK_PASSCRED, &new->flags); + if (test_bit(SOCK_PASSSEC, &old->flags)) + set_bit(SOCK_PASSSEC, &new->flags); +} + static int unix_accept(struct socket *sock, struct socket *newsock, int flags) { struct sock *sk = sock->sk; @@ -1280,6 +1289,7 @@ static int unix_accept(struct socket *sock, struct socket *newsock, int flags) /* attach accepted sock to socket */ unix_state_lock(tsk); newsock->state = SS_CONNECTED; + unix_sock_inherit_flags(sock, newsock); sock_graft(tsk, newsock); unix_state_unlock(tsk); return 0; |