[kernel] r19976 - dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Wed Apr 17 06:25:40 2013
New Revision: 19976

Log:
update skb_header_size() in openvz patch to work on top of fix for CVE-2012-3552

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Apr 15 01:26:58 2013	(r19975)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Wed Apr 17 06:25:40 2013	(r19976)
@@ -6550,6 +6550,7 @@
 [dannf: export signal_wake_up_state instead of signal_wake_up to deal with
  wrapper introduction in 910ffdb18a6408e14febbb6e4b6840fd2c928c82]
 [bwh: Fix context for changes to ip_send_reply() in fix for CVE-2012-3552]
+[dannf: Fix content to skb_header_size() after fix for CVE-2012-3552]
 
 diff --git a/COPYING.Parallels b/COPYING.Parallels
 new file mode 100644
@@ -86138,9 +86139,9 @@
  
 +static int skb_header_size(struct sock *sk, int tcp_hlen)
 +{
-+	struct ip_options *opt = inet_sk(sk)->opt;
++	struct ip_options_rcu *inet_opt = inet_sk(sk)->inet_opt;
 +	return tcp_hlen + sizeof(struct iphdr) +
-+		(opt ? opt->optlen : 0)	+ ETH_HLEN /* For hard header */;
++		(inet_opt ? inet_opt->opt.optlen : 0)	+ ETH_HLEN /* For hard header */;
 +}
 +
  /* This routine actually transmits TCP packets queued in by