tun: don't zeroize sock->file on detach
This is a fix for bug, introduced in 3.4 kernel by commit 1ab5ecb9 ("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: NRuan Zhijie <ruanzhijie@hotmail.com> Tested-by: NRuan Zhijie <ruanzhijie@hotmail.com> Acked-by: NAl Viro <viro@ZenIV.linux.org.uk> Acked-by: NEric Dumazet <edumazet@google.com> Acked-by: NYuchung Cheng <ycheng@google.com> Signed-off-by: NStanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Showing
想要评论请 注册 或 登录