]> git.baikalelectronics.ru Git - kernel.git/commit
tun: don't zeroize sock->file on detach
authorStanislav Kinsbursky <skinsbursky@parallels.com>
Thu, 9 Aug 2012 02:50:40 +0000 (02:50 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Aug 2012 23:16:14 +0000 (16:16 -0700)
commit4ea8084b754bd15738b16883636b0f951829d497
tree2706caf3b68d523fa5250e256f460ef96b788df0
parentbff5a490621632edf21ba8920aa086630551fee7
tun: don't zeroize sock->file on detach

This is a fix for bug, introduced in 3.4 kernel by commit
0e0dc63e592907070c373260d7a216efb823cf57 ("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>
drivers/net/tun.c