You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		12 years ago
..
9p	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
802	net/802/mrp: fix lockdep splat	12 years ago
8021q	vlan: make vlan_dev_real_dev work over stacked vlans	12 years ago
appletalk	net: pass info struct via netdevice notifier	12 years ago
atm	net: always pass struct netdev_notifier_info to netdevice notifiers	12 years ago
ax25	net: Convert uses of typedef ctl_table to struct ctl_table	12 years ago
batman-adv	batman-adv: check return type of unicast packet preparations	12 years ago
bluetooth	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	12 years ago
bridge	bridge: Use the correct bit length for bitmap functions in the VLAN code	12 years ago
caif	net: pass info struct via netdevice notifier	12 years ago
can	net: pass info struct via netdevice notifier	12 years ago
ceph	libceph: call r_unsafe_callback when unsafe reply is received	12 years ago
core	net: Check the correct namespace when spoofing pid over SCM_RIGHTS	12 years ago
dcb	…
dccp	…
decnet	net: Convert uses of typedef ctl_table to struct ctl_table	12 years ago
dns_resolver	net: strict_strtoul is obsolete, use kstrtoul instead	12 years ago
dsa	…
ethernet	net: Fix sysfs_format_mac() code duplication.	12 years ago
ieee802154	net: pass info struct via netdevice notifier	12 years ago
ipv4	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	12 years ago
ipv6	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec	12 years ago
ipx	net: pass info struct via netdevice notifier	12 years ago
irda	net/irda: fixed style issues in irlan_eth	12 years ago
iucv	net: delete __cpuinit usage from all net files	12 years ago
key	af_key: more info leaks in pfkey messages	12 years ago
l2tp	l2tp: make datapath resilient to packet loss when sequence numbers enabled	12 years ago
lapb	…
llc	…
mac80211	mac80211: ibss: fix ignored channel parameter	12 years ago
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	12 years ago
mpls	MPLS: Add limited GSO support	12 years ago
netfilter	netfilter: nf_conntrack: fix tcp_in_window for Fast Open	12 years ago
netlabel	netlabel: use domain based selectors when address based selectors are not available	12 years ago
netlink	genl: Hold reference on correct module while netlink-dump.	12 years ago
netrom	net: Convert uses of typedef ctl_table to struct ctl_table	12 years ago
nfc	NFC: netlink: Rename CMD_FW_UPLOAD to CMD_FW_DOWNLOAD	12 years ago
openvswitch	openvswitch: Reset tunnel key between input and output.	12 years ago
packet	packet: restore packet statistics tp_packets to include drops	12 years ago
phonet	net: Convert uses of typedef ctl_table to struct ctl_table	12 years ago
rds	net: Convert uses of typedef ctl_table to struct ctl_table	12 years ago
rfkill	…
rose	net: Convert uses of typedef ctl_table to struct ctl_table	12 years ago
rxrpc	…
sched	net_sched: restore "linklayer atm" handling	12 years ago
sctp	net: sctp: sctp_transport_destroy{, _rcu}: fix potential pointer corruption	12 years ago
sunrpc	SUNRPC: If the rpcbind channel is disconnected, fail the call to unregister	12 years ago
tipc	tipc: avoid possible deadlock while enable and disable bearer	12 years ago
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	12 years ago
vmw_vsock	net/vmw_vsock/af_vsock.c: drop unneeded semicolon	12 years ago
wimax	…
wireless	cfg80211: don't request disconnect if not connected	12 years ago
x25	x25: Fix broken locking in ioctl error paths.	12 years ago
xfrm	xfrm: Fix potential null pointer dereference in xdst_queue_output	12 years ago
Kconfig	net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL	12 years ago
Makefile	MPLS: Add limited GSO support	12 years ago
compat.c	net: Unbreak compat_sys_{send,recv}msg	12 years ago
nonet.c	…
socket.c	net: rename CONFIG_NET_LL_RX_POLL to CONFIG_NET_RX_BUSY_POLL	12 years ago
sysctl_net.c	…