diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:23:35 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-03 11:23:35 -0800 |
| commit | aceae9be74c70f993ddd8d6a157f1a256591c43f (patch) | |
| tree | d8ef291e4467dfd1d28e31e8a2f38049fdcece2c /net/core/sock.c | |
| parent | 9b133b6207826ae8cbe5f7de0b407253191e98fa (diff) | |
| parent | 676b8efcce52d582153d3df3bc90689cab07a058 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Change-Id: I44dc2744898ca59ad15cd77b49ad84da0220250a
Diffstat (limited to 'net/core/sock.c')
| -rw-r--r-- | net/core/sock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index f4c0917e66b5..f367df38c264 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2384,8 +2384,11 @@ void sock_init_data(struct socket *sock, struct sock *sk) sk->sk_type = sock->type; sk->sk_wq = sock->wq; sock->sk = sk; - } else + sk->sk_uid = SOCK_INODE(sock)->i_uid; + } else { sk->sk_wq = NULL; + sk->sk_uid = make_kuid(sock_net(sk)->user_ns, 0); + } rwlock_init(&sk->sk_callback_lock); lockdep_set_class_and_name(&sk->sk_callback_lock, |