diff options
author | hannes@stressinduktion.org <hannes@stressinduktion.org> | 2015-04-01 11:07:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-06 16:12:49 -0400 |
commit | f60e5990d9c1424af9dbca60a23ba2a1c7c1ce90 (patch) | |
tree | bba5ed057073e42c0113473e1cdbff0bc46ab875 /include/linux/netdevice.h | |
parent | 576b7cd2f6ff1e90b3fc0a000d2fe74f8a50a4bb (diff) |
ipv6: protect skb->sk accesses from recursive dereference inside the stack
We should not consult skb->sk for output decisions in xmit recursion
levels > 0 in the stack. Otherwise local socket settings could influence
the result of e.g. tunnel encapsulation process.
ipv6 does not conform with this in three places:
1) ip6_fragment: we do consult ipv6_npinfo for frag_size
2) sk_mc_loop in ipv6 uses skb->sk and checks if we should
loop the packet back to the local socket
3) ip6_skb_dst_mtu could query the settings from the user socket and
force a wrong MTU
Furthermore:
In sk_mc_loop we could potentially land in WARN_ON(1) if we use a
PF_PACKET socket ontop of an IPv6-backed vxlan device.
Reuse xmit_recursion as we are currently only interested in protecting
tunnel devices.
Cc: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index dcf6ec27739b..278738873703 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -2185,6 +2185,12 @@ void netdev_freemem(struct net_device *dev); | |||
2185 | void synchronize_net(void); | 2185 | void synchronize_net(void); |
2186 | int init_dummy_netdev(struct net_device *dev); | 2186 | int init_dummy_netdev(struct net_device *dev); |
2187 | 2187 | ||
2188 | DECLARE_PER_CPU(int, xmit_recursion); | ||
2189 | static inline int dev_recursion_level(void) | ||
2190 | { | ||
2191 | return this_cpu_read(xmit_recursion); | ||
2192 | } | ||
2193 | |||
2188 | struct net_device *dev_get_by_index(struct net *net, int ifindex); | 2194 | struct net_device *dev_get_by_index(struct net *net, int ifindex); |
2189 | struct net_device *__dev_get_by_index(struct net *net, int ifindex); | 2195 | struct net_device *__dev_get_by_index(struct net *net, int ifindex); |
2190 | struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); | 2196 | struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); |