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

[NET]: Fix error reporting in sys_socketpair(). 

If either of the two sock_alloc_fd() calls fail, we
forget to update 'err' and thus we'll erroneously
return zero in these cases.

Based upon a report and patch from Rich Paul, and
commentary from Chuck Ebbert.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-10-29 21:54:02 -07:00
parent 29b67497f2
commit bf3c23d171
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/socket.c
View File

@ -1250,11 +1250,14 @@ asmlinkage long sys_socketpair(int family, int type, int protocol,
goto out_release_both; goto out_release_both;
fd1 = sock_alloc_fd(&newfile1); fd1 = sock_alloc_fd(&newfile1);
if (unlikely(fd1 < 0)) if (unlikely(fd1 < 0)) {
err = fd1;
goto out_release_both; goto out_release_both;
}
fd2 = sock_alloc_fd(&newfile2); fd2 = sock_alloc_fd(&newfile2);
if (unlikely(fd2 < 0)) { if (unlikely(fd2 < 0)) {
err = fd2;
put_filp(newfile1); put_filp(newfile1);
put_unused_fd(fd1); put_unused_fd(fd1);
goto out_release_both; goto out_release_both;