Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jan 2018 01:55:42 +0000 (17:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jan 2018 01:55:42 +0000 (17:55 -0800)
Pull vfs regression fix from Al Viro/

Fix a leak in socket() introduced by commit 8e1611e23579 ("make
sock_alloc_file() do sock_release() on failures").

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  Fix a leak in socket(2) when we fail to allocate a file descriptor.

1  2 
net/socket.c

diff --cc net/socket.c
Simple merge