diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-03-28 11:03:35 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-03-28 11:03:35 +1100 |
| commit | 840c91dc6a13b160f5b6e5c79c430dffac11c945 (patch) | |
| tree | 5309824f4531b2611a575e7971a935d2e95feb02 /net/phonet/pep.c | |
| parent | 3dfc9b02864b19f4dab376f14479ee4ad1de6c9e (diff) | |
| parent | c02ed2e75ef4c74e41e421acb4ef1494671585e8 (diff) | |
| download | linux-840c91dc6a13b160f5b6e5c79c430dffac11c945.tar.gz | |
update to v4.11-rc4 due to memory corruption bug in rc2
Diffstat (limited to 'net/phonet/pep.c')
| -rw-r--r-- | net/phonet/pep.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/phonet/pep.c b/net/phonet/pep.c index 222bedcd9575..e81537991ddf 100644 --- a/net/phonet/pep.c +++ b/net/phonet/pep.c @@ -772,7 +772,8 @@ static void pep_sock_close(struct sock *sk, long timeout) sock_put(sk); } -static struct sock *pep_sock_accept(struct sock *sk, int flags, int *errp) +static struct sock *pep_sock_accept(struct sock *sk, int flags, int *errp, + bool kern) { struct pep_sock *pn = pep_sk(sk), *newpn; struct sock *newsk = NULL; @@ -846,7 +847,8 @@ static struct sock *pep_sock_accept(struct sock *sk, int flags, int *errp) } /* Create a new to-be-accepted sock */ - newsk = sk_alloc(sock_net(sk), PF_PHONET, GFP_KERNEL, sk->sk_prot, 0); + newsk = sk_alloc(sock_net(sk), PF_PHONET, GFP_KERNEL, sk->sk_prot, + kern); if (!newsk) { pep_reject_conn(sk, skb, PN_PIPE_ERR_OVERLOAD, GFP_KERNEL); err = -ENOBUFS; |