Fix socket bitop damage
Subsystems (3)
PATCH 1/1 Fix socket bitop damage
The socket flag cleanups that went into 2.6.12-rc1 are basically oring the flags of an old socket into the socket just being created. Unfortunately that one was just initialized by sock_init_data(), so already has SOCK_ZAPPED set. As the result zapped sockets are created and all incoming connection will fail due to this bug which again was carefully replicated to at least AX.25, NET/ROM or ROSE.
In order to keep the abstraction alive I've introduced sock_copy_flags() to copy the socket flags from one sockets to another and used that instead of the bitwise copy thing. Anyway, the idea here has probably been to copy all flags, so sock_copy_flags() should be the right thing. With this the ham radio protocols are usable again, so I hope this will make it into 2.6.13.
include/net/sock.h | 5 +++++ net/ax25/af_ax25.c | 7 +------ net/netrom/af_netrom.c | 7 +------ net/rose/af_rose.c | 7 +------ 4 files changed, 8 insertions(+), 18 deletions(-)
net/netrom/af_netrom.c +1 -6
@@ -465,12 +465,7 @@ static struct sock *nr_make_new(struct s sk->sk_sndbuf = osk->sk_sndbuf; sk->sk_state =TCP_ESTABLISHED ; sk->sk_sleep = osk->sk_sleep; - -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);skb_queue_head_init (&nr->ack_queue);skb_queue_head_init (&nr->reseq_queue);
include/net/sock.h +5 -0
@@ -384,6 +384,11 @@ enum sock_flags { SOCK_QUEUE_SHRUNK, /* write queue has been shrunk recently */ }; +static inline void sock_copy_flags (struct sock *nsk,struct sock *osk) +{ + nsk->sk_flags = osk->sk_flags; +} +static inline void sock_set_flag (struct sock *sk,enum sock_flags flag) {__set_bit (flag, &sk->sk_flags);
net/ax25/af_ax25.c +1 -6
@@ -884,12 +884,7 @@ struct sock *ax25_make_new(struct sock * sk->sk_sndbuf = osk->sk_sndbuf; sk->sk_state =TCP_ESTABLISHED ; sk->sk_sleep = osk->sk_sleep; - -if (sock_flag (osk,SOCK_DBG )) -sock_set_flag (sk,SOCK_DBG ); - -if (sock_flag (osk,SOCK_ZAPPED )) -sock_set_flag (sk,SOCK_ZAPPED ); +sock_copy_flags (sk, osk); oax25 =ax25_sk (osk);
net/rose/af_rose.c +1 -6
@@ -556,12 +556,7 @@ static struct sock *rose_make_new(struct sk->sk_sndbuf = osk->sk_sndbuf; sk->sk_state =TCP_ESTABLISHED ; sk->sk_sleep = osk->sk_sleep; - -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);init_timer (&rose->timer);init_timer (&rose->idletimer);
* Ralf Baechle <[email protected]> 2005-08-22 12:02
Quoted 6 lines
The socket flag cleanups that went into 2.6.12-rc1 are basically oring the flags of an old socket into the socket just being created. Unfortunately that one was just initialized by
sock_init_data(), so already hasSOCK_ZAPPEDset. As the result zapped sockets are created and all incoming connection will fail due to this bug which again was carefully replicated to at least AX.25, NET/ROM or ROSE.
I'm probably to one to blame here but I don't get the point yet. What I did was to change the bitfield based flags to use sk_flags like this:
- sk->sk_zapped = osk->sk_zapped;
+
+ if (sock_flag(osk, SOCK_ZAPPED))
+ sock_set_flag(sk, SOCK_ZAPPED);
* Thomas Graf <[email protected]> 2005-08-22 13:14
Quoted 9 lines
* Ralf Baechle <[email protected]> 2005-08-22 12:02
Quoted 6 lines
The socket flag cleanups that went into 2.6.12-rc1 are basically oring the flags of an old socket into the socket just being created. Unfortunately that one was just initialized by
sock_init_data(), so already hasSOCK_ZAPPEDset. As the result zapped sockets are created and all incoming connection will fail due to this bug which again was carefully replicated to at least AX.25, NET/ROM or ROSE.I'm probably to one to blame here but I don't get the point yet.
Never mind, I got it, sk->sk_flags may be be != 0.
From: Ralf Baechle <[email protected]>
Date: Mon, 22 Aug 2005 12:02:18 +0100
Quoted 7 lines
The socket flag cleanups that went into 2.6.12-rc1 are basically oring the flags of an old socket into the socket just being created. Unfortunately that one was just initialized by
sock_init_data(), so already hasSOCK_ZAPPEDset. As the result zapped sockets are created and all incoming connection will fail due to this bug which again was carefully replicated to at least AX.25, NET/ROM or ROSE.
Quoted 8 lines
In order to keep the abstraction alive I've introduced
sock_copy_flags()to copy the socket flags from one sockets to another and used that instead of the bitwise copy thing. Anyway, the idea here has probably been to copy all flags, sosock_copy_flags()should be the right thing. With this the ham radio protocols are usable again, so I hope this will make it into 2.6.13.Signed-off-by Ralf Baechle DL5RB <[email protected]>
Applied, thanks Ralf.
From: Ralf Baechle <[email protected]>
Date: Mon, 22 Aug 2005 12:02:18 +0100
Quoted 7 lines
The socket flag cleanups that went into 2.6.12-rc1 are basically oring the flags of an old socket into the socket just being created. Unfortunately that one was just initialized by
sock_init_data(), so already hasSOCK_ZAPPEDset. As the result zapped sockets are created and all incoming connection will fail due to this bug which again was carefully replicated to at least AX.25, NET/ROM or ROSE.
Quoted 8 lines
In order to keep the abstraction alive I've introduced
sock_copy_flags()to copy the socket flags from one sockets to another and used that instead of the bitwise copy thing. Anyway, the idea here has probably been to copy all flags, sosock_copy_flags()should be the right thing. With this the ham radio protocols are usable again, so I hope this will make it into 2.6.13.Signed-off-by Ralf Baechle DL5RB <[email protected]>
Applied, thanks Ralf.