diff options
| author | Shaun Pereira <pereira.shaun@gmail.com> | 2006-01-06 22:11:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-06 22:11:35 +0100 |
| commit | a20a8554796bc4e28879beabd0db4bf3ce77b686 (patch) | |
| tree | 2fdc866d3fe722e6eea6b6bb4017b9ab53927a62 | |
| parent | [NET]: Change sk_run_filter()'s return type in net/core/filter.c (diff) | |
| download | linux-a20a8554796bc4e28879beabd0db4bf3ce77b686.tar.xz linux-a20a8554796bc4e28879beabd0db4bf3ce77b686.zip | |
[X25]: Fix for broken x25 module.
When a user-space server application calls bind on a socket, then in kernel
space this bound socket is considered 'x25-linked' and the SOCK_ZAPPED flag
is unset.(As in x25_bind()/af_x25.c).
Now when a user-space client application attempts to connect to the server
on the listening socket, if the kernel accepts this in-coming call, then it
returns a new socket to userland and attempts to reply to the caller.
The reply/x25_sendmsg() will fail, because the new socket created on
call-accept has its SOCK_ZAPPED flag set by x25_make_new().
(sock_init_data() called by x25_alloc_socket() called by x25_make_new()
sets the flag to SOCK_ZAPPED)).
Fix: Using the sock_copy_flag() routine available in sock.h fixes this.
Tested on 32 and 64 bit kernels with x25 over tcp.
Signed-off-by: Shaun Pereira <pereira.shaun@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/x25/af_x25.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 16459c7f54b2..bfabaf9cba87 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -540,12 +540,7 @@ static struct sock *x25_make_new(struct sock *osk) sk->sk_state = TCP_ESTABLISHED; sk->sk_sleep = osk->sk_sleep; sk->sk_backlog_rcv = osk->sk_backlog_rcv; - - if (sock_flag(osk, SOCK_ZAPPED)) - sock_set_flag(sk, SOCK_ZAPPED); - - if (sock_flag(osk, SOCK_DBG)) - sock_set_flag(sk, SOCK_DBG); + sock_copy_flags(sk, osk); ox25 = x25_sk(osk); x25->t21 = ox25->t21; |