diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
| commit | 25f73891c3059e9ce6ff0a02670aa98baf6cbce9 (patch) | |
| tree | 18a2ef934aa353ca695c3faaa3b7497fea22037a /net/socket.c | |
| parent | fef6108d4556917c45cd9ba397c1c7597f3990e1 (diff) | |
| parent | 4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 23898f45f713..0ce12dfc7a71 100644 --- a/net/socket.c +++ b/net/socket.c | |||
| @@ -490,6 +490,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed) | |||
| 490 | struct file *file; | 490 | struct file *file; |
| 491 | struct socket *sock; | 491 | struct socket *sock; |
| 492 | 492 | ||
| 493 | *err = -EBADF; | ||
| 493 | file = fget_light(fd, fput_needed); | 494 | file = fget_light(fd, fput_needed); |
| 494 | if (file) { | 495 | if (file) { |
| 495 | sock = sock_from_file(file, err); | 496 | sock = sock_from_file(file, err); |