David S. Miller 79f9ab7e0a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec ... Steffen Klassert says: ==================== This pull request fixes some issues that arise when 6in4 or 4in6 tunnels are used in combination with IPsec, all from Hannes Frederic Sowa and a null pointer dereference when queueing packets to the policy hold queue. 1) We might access the local error handler of the wrong address family if 6in4 or 4in6 tunnel is protected by ipsec. Fix this by addind a pointer to the correct local_error to xfrm_state_afinet. 2) Add a helper function to always refer to the correct interpretation of skb->sk. 3) Call skb_reset_inner_headers to record the position of the inner headers when adding a new one in various ipv6 tunnels. This is needed to identify the addresses where to send back errors in the xfrm layer. 4) Dereference inner ipv6 header if encapsulated to always call the right error handler. 5) Choose protocol family by skb protocol to not call the wrong xfrm{4,6}_local_error handler in case an ipv6 sockets is used in ipv4 mode. 6) Partly revert "xfrm: introduce helper for safe determination of mtu" because this introduced pmtu discovery problems. 7) Set skb->protocol on tcp, raw and ip6_append_data genereated skbs. We need this to get the correct mtu informations in xfrm. 8) Fix null pointer dereference in xdst_queue_output. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>		2013-08-29 16:05:30 -04:00
..
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
af_inet.c	gro: remove a sparse error	2013-06-12 15:03:24 -07:00
ah4.c	ipv4: properly refresh rtable entries on pmtu/redirect events	2013-06-03 00:07:42 -07:00
arp.c	arp: flush arp cache on IFF_NOARP change	2013-05-28 13:11:02 -07:00
cipso_ipv4.c
datagram.c	ipv4: Add a socket release callback for datagram sockets	2013-01-21 14:17:05 -05:00
devinet.c	net: rtm_to_ifaddr: free ifa if ifa_cacheinfo processing fails	2013-08-02 14:56:06 -07:00
esp4.c	net: esp{4,6}: fix potential MTU calculation overflows	2013-08-05 12:26:50 -07:00
fib_frontend.c	netlink: fix splat in skb_clone with large messages	2013-06-27 22:44:16 -07:00
fib_lookup.h
fib_rules.c	sections: fix section conflicts in net	2012-10-06 03:04:45 +09:00
fib_semantics.c	ipv4: use next hop exceptions also for input routes	2013-06-28 21:27:47 -07:00
fib_trie.c	fib_trie: remove potential out of bound access	2013-08-05 15:26:11 -07:00
gre_demux.c	net: gre: move GSO functions to gre_offload	2013-07-03 14:37:39 -07:00
gre_offload.c	gso: Update tunnel segmentation to support Tx checksum offload	2013-07-11 12:18:49 -07:00
icmp.c	icmp: avoid allocating large struct on stack	2013-06-03 00:28:44 -07:00
igmp.c	igmp: fix new sparse errors	2013-06-12 14:14:55 -07:00
inet_connection_sock.c	tcp: Remove TCPCT	2013-03-17 14:35:13 -04:00
inet_diag.c	netlink: rename ssk to sk in struct netlink_skb_params	2013-04-19 14:57:56 -04:00
inet_fragment.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
inet_hashtables.c	inet: fix spacing in assignment	2013-07-11 12:02:39 -07:00
inet_lro.c	ipv4: replace ip_fast_csum with csum_replace2	2013-03-15 09:12:25 -04:00
inet_timewait_sock.c	hlist: drop the node parameter from iterators	2013-02-27 19:10:24 -08:00
inetpeer.c	Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2012-10-02 09:54:49 -07:00
ip_forward.c	ipv4: introduce rt_uses_gateway	2012-10-08 17:42:36 -04:00
ip_fragment.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
ip_gre.c	ip_gre: fix ipgre_header to return correct offset	2013-08-09 11:05:24 -07:00
ip_input.c	ipv4: set transport header earlier	2013-07-16 12:59:28 -07:00
ip_options.c	net/ipv4: Ensure that location of timestamp option is stored	2013-03-12 05:35:39 -04:00
ip_output.c	xfrm: introduce helper for safe determination of mtu	2013-08-14 13:09:07 +02:00
ip_sockglue.c	net: prevent setting ttl=0 via IP_TTL	2013-01-08 17:57:10 -08:00
ip_tunnel.c	gre: Fix MTU sizing check for gretap tunnels	2013-07-11 16:12:03 -07:00
ip_tunnel_core.c	ip_tunnel: Do not use inner ip-header-id for tunnel ip-header-id.	2013-08-13 16:52:50 -07:00
ip_vti.c	vti: remove duplicated code to fix a memory leak	2013-07-01 23:37:14 -07:00
ipcomp.c	ipv4: properly refresh rtable entries on pmtu/redirect events	2013-06-03 00:07:42 -07:00
ipconfig.c	ipconfig: add informative timeout messages while waiting for carrier	2013-04-02 14:35:33 -04:00
ipip.c	ipip: fix a regression in ioctl	2013-07-02 01:13:09 -07:00
ipmr.c	net: remove last caller of skb_tail_offset() and itself	2013-06-10 22:22:23 -07:00
Kconfig	Kconfig: remove dangling references to the deleted file	2013-06-04 15:17:39 -07:00
Makefile	net: gre: move GSO functions to gre_offload	2013-07-03 14:37:39 -07:00
netfilter.c	netfilter: add my copyright statements	2013-04-18 20:27:55 +02:00
ping.c	net: ping_check_bind_addr() etc. can be static	2013-06-13 01:36:41 -07:00
proc.c	net: rename busy poll MIB counter	2013-08-09 11:39:08 -07:00
protocol.c	ipv4: Disallow non-namespace aware protocols to register.	2013-02-05 14:42:23 -05:00
raw.c	ipv4: sendto/hdrincl: don't use destination address found in header	2013-08-29 15:57:52 -04:00
route.c	ipv4: use next hop exceptions also for input routes	2013-06-28 21:27:47 -07:00
syncookies.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
sysctl_net_ipv4.c	sysctl net: Keep tcp_syn_retries inside the boundary	2013-07-19 17:36:03 -07:00
tcp.c	tcp: set timestamps for restored skb-s	2013-08-20 13:07:15 -07:00
tcp_bic.c
tcp_cong.c	tcp: remove Appropriate Byte Count support	2013-02-05 14:51:16 -05:00
tcp_cubic.c	tcp: cubic: fix bug in bictcp_acked()	2013-08-07 10:35:08 -07:00
tcp_diag.c
tcp_fastopen.c	tcp: TCP Fast Open Server - header & support functions	2012-08-31 20:02:18 -04:00
tcp_highspeed.c
tcp_htcp.c
tcp_hybla.c
tcp_illinois.c	net: fix divide by zero in tcp algorithm illinois	2012-11-01 11:55:59 -04:00
tcp_input.c	tcp: don't apply tsoffset if rcv_tsecr is zero	2013-08-29 15:11:12 -04:00
tcp_ipv4.c	net: rename ll methods to busy-poll	2013-07-10 17:08:27 -07:00
tcp_lp.c
tcp_memcontrol.c	net: tcp_memcontrol: minor: remove unused variable	2013-04-14 15:41:49 -04:00
tcp_metrics.c	tcp: do not expire TCP fastopen cookies	2013-05-05 16:58:02 -04:00
tcp_minisocks.c	tcp: md5: remove spinlock usage in fast path	2013-05-20 14:00:42 -07:00
tcp_offload.c	net: tcp: move GRO/GSO functions to tcp_offload	2013-06-07 14:39:05 -07:00
tcp_output.c	tcp: initialize rcv_tstamp for restored sockets	2013-08-29 15:11:11 -04:00
tcp_probe.c	net: proc: change proc_net_remove to remove_proc_entry	2013-02-18 14:53:08 -05:00
tcp_scalable.c
tcp_timer.c	tcp: refactor F-RTO	2013-03-21 11:47:50 -04:00
tcp_vegas.c
tcp_vegas.h
tcp_veno.c
tcp_westwood.c	tcp: refactor F-RTO	2013-03-21 11:47:50 -04:00
tcp_yeah.c
tunnel4.c
udp.c	gso: Update tunnel segmentation to support Tx checksum offload	2013-07-11 12:18:49 -07:00
udp_diag.c	netlink: rename ssk to sk in struct netlink_skb_params	2013-04-19 14:57:56 -04:00
udp_impl.h
udp_offload.c	net: udp4: move GSO functions to udp_offload	2013-06-12 00:47:25 -07:00
udplite.c
xfrm4_input.c	net: Add skb_unclone() helper function.	2013-02-15 15:10:37 -05:00
xfrm4_mode_beet.c
xfrm4_mode_transport.c
xfrm4_mode_tunnel.c	xfrm: allow to avoid copying DSCP during encapsulation	2013-03-06 07:02:45 +01:00
xfrm4_output.c	xfrm: revert ipv4 mtu determination to dst_mtu	2013-08-26 12:40:53 +02:00
xfrm4_policy.c	xfrm: make gc_thresh configurable in all namespaces	2013-02-06 11:36:29 +01:00
xfrm4_state.c	xfrm: make local error reporting more robust	2013-08-14 13:07:12 +02:00
xfrm4_tunnel.c	sit: add IPv4 over IPv4 support	2013-05-31 17:19:05 -07:00