knfsd: Fix race that can disable NFS server.
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): 20061020114959.26698.patches@notabene
PATCH 1/1 knfsd: Fix race that can disable NFS server.
This patch is suitable for just about any 2.6 kernel.
It should go in 2.6.19 and 2.6.18.2 and possible even the .17 and .16 stable series.
### Comments for Changeset
This is a long standing bug that seems to have only recently become apparent, presumably due to increasing use of NFS over TCP - many distros seem to be making it the default.
The SK_CONN bit gets set when a listening socket may be ready for an accept, just as SK_DATA is set when data may be available.
It is entirely possible for svc_tcp_accept to be called with neither of these set. It doesn't happen often but there is a small race in svc_sock_enqueue as SK_CONN and SK_DATA are tested outside the spin_lock. They could be cleared immediately after the test and before the lock is gained.
This normally shouldn't be a problem. The sockets are non-blocking so trying to read() or accept() when ther is nothing to do is not a problem.
However: svc_tcp_recvfrom makes the decision "Should I accept() or should I read()" based on whether SK_CONN is set or not. This usually works but is not safe. The decision should be based on whether it is a TCP_LISTEN socket or a TCP_CONNECTED socket.
### Diffstat output
./net/sunrpc/svcsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/svcsock.c +1 -1
@@ -1002,7 +1002,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return 0 ; } -if (test_bit (SK_CONN , &svsk->sk_flags)) { +if (svsk->sk_sk->sk_state ==TCP_LISTEN ) {svc_tcp_accept (svsk);svc_sock_received (svsk);return 0 ;
Adrian Bunk
AppliedQuoted 3 lines · NeilBrown
This patch is suitable for just about any 2.6 kernel.
It should go in 2.6.19 and 2.6.18.2 and possible even the .17 and .16 stable series.
Thanks, applied to 2.6.16.
Quoted 34 lines
### Comments for Changeset
This is a long standing bug that seems to have only recently become apparent, presumably due to increasing use of NFS over TCP - many distros seem to be making it the default.
The
SK_CONNbit gets set when a listening socket may be ready for an accept, just asSK_DATAis set when data may be available.It is entirely possible for
svc_tcp_acceptto be called with neither of these set. It doesn't happen often but there is a small race insvc_sock_enqueueasSK_CONNandSK_DATAare tested outside thespin_lock. They could be cleared immediately after the test and before the lock is gained.This normally shouldn't be a problem. The sockets are non-blocking so trying to
read()oraccept()when ther is nothing to do is not a problem.However:
svc_tcp_recvfrommakes the decision "Should Iaccept()or should Iread()" based on whetherSK_CONNis set or not. This usually works but is not safe. The decision should be based on whether it is aTCP_LISTENsocket or aTCP_CONNECTEDsocket.Signed-off-by Neil Brown <[email protected]>### Diffstat output
./net/sunrpc/svcsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff
.prev/net/sunrpc/svcsock.c./net/sunrpc/svcsock.c
net/sunrpc/svcsock.c svc_tcp_recvfrom(struct svc_rqst *rqstp) · line 1008
Quoted 8 lines
net/sunrpc/svcsock.c +1
-1@@ -1002,7 +1002,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)return 0 ; } -if (test_bit (SK_CONN , &svsk->sk_flags)) { +if (svsk->sk_sk->sk_state ==TCP_LISTEN ) {svc_tcp_accept (svsk);svc_sock_received (svsk);return 0 ;
cu
Adrian
Signature · 14 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs