Skip to contentSkip to conversation

X25: Fix x25_create errors for bad protocol and ENOBUFS

PATCH Applied Andrew Hendry 2 participants 2 messages Feb 14, 2010 – Feb 16, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

---

net/x25/af_x25.c +9 -4
index e3219e4..6c7104e 100644
@@ -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;
 
Signature · 1 line
1.6.3.3