From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, ruanzhijie@hotmail.com,
linux-kernel@vger.kernel.org
Subject: [RFC PATCH] tun: don't zeroize sock->file on detach
Date: Wed, 11 Jul 2012 15:48:20 +0400 [thread overview]
Message-ID: <20120711114753.24395.53193.stgit@localhost6.localdomain6> (raw)
This is a fix for bug, introduced in 3.4 kernel by commit
1ab5ecb90cb6a3df1476e052f76a6e8f6511cb3d, 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.
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
drivers/net/tun.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 987aeef..c1639f3 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -185,7 +185,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 */
next reply other threads:[~2012-07-11 11:48 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 11:48 Stanislav Kinsbursky [this message]
2012-07-14 8:15 ` [RFC PATCH] tun: don't zeroize sock->file on detach Al Viro
2012-07-19 6:06 ` Eric Dumazet
2012-08-08 12:53 ` Stanislav Kinsbursky
2012-08-08 17:48 ` Yuchung Cheng
2012-08-08 21:34 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120711114753.24395.53193.stgit@localhost6.localdomain6 \
--to=skinsbursky@parallels.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ruanzhijie@hotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox