2010-02-14 12:06:07

by Andrew Hendry

Subject: [PATCH 1/2] 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 <[email protected]>

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

--
1.6.3.3

2010-02-16 05:54:50

by David Miller

Subject: Re: [PATCH 1/2] X25: Fix x25_create errors for bad protocol and ENOBUFS

From: Andrew Hendry <[email protected]>
Date: Sun, 14 Feb 2010 23:00:11 +1100

> alloc_socket failures should return -ENOBUFS
> a bad protocol should return -EINVAL
>
> Signed-off-by: Andrew Hendry <[email protected]>

Applied.