Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66d1b926 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by David S. Miller
Browse files

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: default avatarRuan Zhijie <ruanzhijie@hotmail.com>
Tested-by: default avatarRuan Zhijie <ruanzhijie@hotmail.com>
Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a2d6a1d5
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ static void __tun_detach(struct tun_struct *tun)
	netif_tx_lock_bh(tun->dev);
	netif_carrier_off(tun->dev);
	tun->tfile = NULL;
	tun->socket.file = NULL;
	netif_tx_unlock_bh(tun->dev);

	/* Drop read queue */