diff options
author | Jiri Bohac <jbohac@suse.cz> | 2014-11-19 23:05:49 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-20 22:57:03 -0500 |
commit | 01462405f0c093b2f8dfddafcadcda6c9e4c5cdf (patch) | |
tree | b405f0cb9c2f653335ef88507f8ba6d16600c87a /usr | |
parent | d3052bb5d306b29c1e7d9e5998c5ac4ca1ff0ca9 (diff) | |
download | op-kernel-dev-01462405f0c093b2f8dfddafcadcda6c9e4c5cdf.zip op-kernel-dev-01462405f0c093b2f8dfddafcadcda6c9e4c5cdf.tar.gz |
ipx: fix locking regression in ipx_sendmsg and ipx_recvmsg
This fixes an old regression introduced by commit
b0d0d915 (ipx: remove the BKL).
When a recvmsg syscall blocks waiting for new data, no data can be sent on the
same socket with sendmsg because ipx_recvmsg() sleeps with the socket locked.
This breaks mars-nwe (NetWare emulator):
- the ncpserv process reads the request using recvmsg
- ncpserv forks and spawns nwconn
- ncpserv calls a (blocking) recvmsg and waits for new requests
- nwconn deadlocks in sendmsg on the same socket
Commit b0d0d915 has simply replaced BKL locking with
lock_sock/release_sock. Unlike now, BKL got unlocked while
sleeping, so a blocking recvmsg did not block a concurrent
sendmsg.
Only keep the socket locked while actually working with the socket data and
release it prior to calling skb_recv_datagram().
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'usr')
0 files changed, 0 insertions, 0 deletions