mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three cases of simple overlapping changes. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
6026e043d0
359 changed files with 2437 additions and 1658 deletions
|
|
@ -1387,6 +1387,10 @@ static int kcm_attach(struct socket *sock, struct socket *csock,
|
|||
if (!csk)
|
||||
return -EINVAL;
|
||||
|
||||
/* We must prevent loops or risk deadlock ! */
|
||||
if (csk->sk_family == PF_KCM)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
psock = kmem_cache_zalloc(kcm_psockp, GFP_KERNEL);
|
||||
if (!psock)
|
||||
return -ENOMEM;
|
||||
|
|
|
|||
Loading…
Reference in a new issue