diff options
author | Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz> | 2012-07-19 02:13:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-20 14:21:06 -0400 |
commit | b09e786bd1dd66418b69348cb110f3a64764626a (patch) | |
tree | e4f12db01edc11d669f32a2d3d6832b22f57f656 /include | |
parent | 521f549097a79dc55e18c3bc752ef2127ad70ac5 (diff) |
tun: fix a crash bug and a memory leak
This patch fixes a crash
tun_chr_close -> netdev_run_todo -> tun_free_netdev -> sk_release_kernel ->
sock_release -> iput(SOCK_INODE(sock))
introduced by commit 1ab5ecb90cb6a3df1476e052f76a6e8f6511cb3d
The problem is that this socket is embedded in struct tun_struct, it has
no inode, iput is called on invalid inode, which modifies invalid memory
and optionally causes a crash.
sock_release also decrements sockets_in_use, this causes a bug that
"sockets: used" field in /proc/*/net/sockstat keeps on decreasing when
creating and closing tun devices.
This patch introduces a flag SOCK_EXTERNALLY_ALLOCATED that instructs
sock_release to not free the inode and not decrement sockets_in_use,
fixing both memory corruption and sockets_in_use underflow.
It should be backported to 3.3 an 3.4 stabke.
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/net.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index e9ac2df079ba..dc95700de5df 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
@@ -72,6 +72,7 @@ struct net; | |||
72 | #define SOCK_NOSPACE 2 | 72 | #define SOCK_NOSPACE 2 |
73 | #define SOCK_PASSCRED 3 | 73 | #define SOCK_PASSCRED 3 |
74 | #define SOCK_PASSSEC 4 | 74 | #define SOCK_PASSSEC 4 |
75 | #define SOCK_EXTERNALLY_ALLOCATED 5 | ||
75 | 76 | ||
76 | #ifndef ARCH_HAS_SOCKET_TYPES | 77 | #ifndef ARCH_HAS_SOCKET_TYPES |
77 | /** | 78 | /** |