summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2010-02-14 02:00:11 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-15 21:49:51 -0800
commitb18e7a06857833d2c7c8c8457e5a3a7c3327f643 (patch)
treeabf2e7f6705e6043815edecd6d8fc0cec4c582f5
parentcf588477a3fbf085426e5c0b6205984ebb7e2187 (diff)
downloadlinux-3.10-b18e7a06857833d2c7c8c8457e5a3a7c3327f643.tar.gz
linux-3.10-b18e7a06857833d2c7c8c8457e5a3a7c3327f643.tar.bz2
linux-3.10-b18e7a06857833d2c7c8c8457e5a3a7c3327f643.zip
X25: Fix x25_create errors for bad protocol and ENOBUFS
alloc_socket failures should return -ENOBUFS a bad protocol should return -EINVAL Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/x25/af_x25.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e3219e4cd04..6c7104edec6 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -512,15 +512,20 @@ static int x25_create(struct net *net, struct socket *sock, int protocol,
{
struct sock *sk;
struct x25_sock *x25;
- int rc = -ESOCKTNOSUPPORT;
+ int rc = -EAFNOSUPPORT;
if (!net_eq(net, &init_net))
- return -EAFNOSUPPORT;
+ goto out;
+
+ rc = -ESOCKTNOSUPPORT;
+ if (sock->type != SOCK_SEQPACKET)
+ goto out;
- if (sock->type != SOCK_SEQPACKET || protocol)
+ rc = -EINVAL;
+ if (protocol)
goto out;
- rc = -ENOMEM;
+ rc = -ENOBUFS;
if ((sk = x25_alloc_socket(net)) == NULL)
goto out;