diff options
| author |   Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-08-09 02:50:40 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-08-09 16:16:14 -0700 |
| commit | 66d1b9263a371abd15806c53f486f0645ef31a8f (patch) | |
| tree | 2706caf3b68d523fa5250e256f460ef96b788df0 /drivers/net/ethernet | |
| parent | igb: Fix register defines for all non-82575 hardware (diff) | |
| download | linux-dev-66d1b9263a371abd15806c53f486f0645ef31a8f.tar.xz linux-dev-66d1b9263a371abd15806c53f486f0645ef31a8f.zip | |
tun: don't zeroize sock->file on detach
This is a fix for bug, introduced in 3.4 kernel by commit
1ab5ecb90cb6a3df1476e052f76a6e8f6511cb3d ("tun: don't hold network
namespace by tun sockets"), which, among other things, replaced simple
sock_put() by sk_release_kernel(). Below is sequence, which leads to
oops for non-persistent devices:
tun_chr_close()
tun_detach() <== tun->socket.file = NULL
tun_free_netdev()
sk_release_sock()
sock_release(sock->file == NULL)
iput(SOCK_INODE(sock)) <== dereference on NULL pointer
This patch just removes zeroing of socket's file from __tun_detach().
sock_release() will do this.
Cc: stable@vger.kernel.org
Reported-by: Ruan Zhijie <ruanzhijie@hotmail.com>
Tested-by: Ruan Zhijie <ruanzhijie@hotmail.com>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
0 files changed, 0 insertions, 0 deletions