aboutsummaryrefslogtreecommitdiff
path: root/net/socket.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-26 06:15:27 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-26 06:15:27 -0400
commit25f73891c3059e9ce6ff0a02670aa98baf6cbce9 (patch)
tree18a2ef934aa353ca695c3faaa3b7497fea22037a /net/socket.c
parentfef6108d4556917c45cd9ba397c1c7597f3990e1 (diff)
parent4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff)
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c
index 23898f45f71..0ce12dfc7a7 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)
struct file *file;
struct socket *sock;
+ *err = -EBADF;
file = fget_light(fd, fput_needed);
if (file) {
sock = sock_from_file(file, err);