Commit 06137619 authored by Martin Schiller's avatar Martin Schiller Committed by David S. Miller

net/x25: fix null_x25_address handling

o x25_find_listener(): the compare for the null_x25_address was wrong.
   We have to check the x25_addr of the listener socket instead of the
   x25_addr of the incomming call.

 o x25_bind(): it was not possible to bind a socket to null_x25_address
Signed-off-by: default avatarMartin Schiller <ms@dev.tdt.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d449ba3d
...@@ -288,7 +288,7 @@ static struct sock *x25_find_listener(struct x25_address *addr, ...@@ -288,7 +288,7 @@ static struct sock *x25_find_listener(struct x25_address *addr,
sk_for_each(s, &x25_list) sk_for_each(s, &x25_list)
if ((!strcmp(addr->x25_addr, if ((!strcmp(addr->x25_addr,
x25_sk(s)->source_addr.x25_addr) || x25_sk(s)->source_addr.x25_addr) ||
!strcmp(addr->x25_addr, !strcmp(x25_sk(s)->source_addr.x25_addr,
null_x25_address.x25_addr)) && null_x25_address.x25_addr)) &&
s->sk_state == TCP_LISTEN) { s->sk_state == TCP_LISTEN) {
/* /*
...@@ -688,6 +688,9 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -688,6 +688,9 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
goto out; goto out;
} }
/* check for the null_x25_address */
if (strcmp(addr->sx25_addr.x25_addr, null_x25_address.x25_addr)) {
len = strlen(addr->sx25_addr.x25_addr); len = strlen(addr->sx25_addr.x25_addr);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (!isdigit(addr->sx25_addr.x25_addr[i])) { if (!isdigit(addr->sx25_addr.x25_addr[i])) {
...@@ -695,6 +698,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -695,6 +698,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
goto out; goto out;
} }
} }
}
lock_sock(sk); lock_sock(sk);
x25_sk(sk)->source_addr = addr->sx25_addr; x25_sk(sk)->source_addr = addr->sx25_addr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment