UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a leak in socket(2) when we fail to allocate a file descriptor. 

Got broken by "make sock_alloc_file() do sock_release() on failures" -
cleanup after sock_map_fd() failure got pulled all the way into
sock_alloc_file(), but it used to serve the case when sock_map_fd()
failed *before* getting to sock_alloc_file() as well, and that got
lost.  Trivial to fix, fortunately.

Fixes: 8e1611e235 (make sock_alloc_file() do sock_release() on failures)
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-01-10 18:47:05 -05:00
parent 040ee69226
commit ce4bb04cae
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/socket.c
View File

@ -432,8 +432,10 @@ static int sock_map_fd(struct socket *sock, int flags)
{ {
struct file *newfile; struct file *newfile;
int fd = get_unused_fd_flags(flags); int fd = get_unused_fd_flags(flags);
if (unlikely(fd < 0)) if (unlikely(fd < 0)) {
sock_release(sock);
return fd; return fd;
}
newfile = sock_alloc_file(sock, flags, NULL); newfile = sock_alloc_file(sock, flags, NULL);
if (likely(!IS_ERR(newfile))) { if (likely(!IS_ERR(newfile))) {