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>

1 files changed, 9 insertions, 4 deletions

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index e3219e4cd044..6c7104edec60 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;