Skip to content

Commit

Permalink
[IPV4] Fix EPROTONOSUPPORT error in inet_create
Browse files Browse the repository at this point in the history
There is a coding error in inet_create that causes it to always return
ESOCKTNOSUPPORT.  It should return EPROTONOSUPPORT when there are
protocols registered for a given socket type but none of them match
the requested protocol.

This is based on a patch by Jayachandran C.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
herbertx authored and davem330 committed Dec 3, 2005
1 parent 24c6927 commit 86c8f9d
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions net/ipv4/af_inet.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,14 @@ static int inet_create(struct socket *sock, int protocol)
unsigned char answer_flags;
char answer_no_check;
int try_loading_module = 0;
int err = -ESOCKTNOSUPPORT;
int err;

sock->state = SS_UNCONNECTED;

/* Look for the requested type/protocol pair. */
answer = NULL;
lookup_protocol:
err = -ESOCKTNOSUPPORT;
rcu_read_lock();
list_for_each_rcu(p, &inetsw[sock->type]) {
answer = list_entry(p, struct inet_protosw, list);
Expand All @@ -252,6 +253,7 @@ static int inet_create(struct socket *sock, int protocol)
if (IPPROTO_IP == answer->protocol)
break;
}
err = -EPROTONOSUPPORT;
answer = NULL;
}

Expand Down Expand Up @@ -280,9 +282,6 @@ static int inet_create(struct socket *sock, int protocol)
err = -EPERM;
if (answer->capability > 0 && !capable(answer->capability))
goto out_rcu_unlock;
err = -EPROTONOSUPPORT;
if (!protocol)
goto out_rcu_unlock;

sock->ops = answer->ops;
answer_prot = answer->prot;
Expand Down

0 comments on commit 86c8f9d

Please sign in to comment.