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

[Dann Frazier]

Author: dannf
Date: Thu Feb 14 07:22:42 2013
New Revision: 19808

Log:
adjust to apply on top of CVE-2010-4805 changes

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	Thu Feb 14 07:02:29 2013	(r19807)
+++ dists/squeeze-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Thu Feb 14 07:22:42 2013	(r19808)
@@ -38904,9 +38904,9 @@
  /*
   * This structure really needs to be cleaned up.
   * Most of it is for TCP, and not used by any of
-@@ -301,6 +303,8 @@ struct sock {
- 	int			sk_backlog_len;
- 	int			sk_backlog_limit;
+@@ -304,6 +306,8 @@ struct sock {
+ #ifndef __GENKSYMS__
+ 	int                     sk_backlog_len;
  #endif
 +	struct sock_beancounter sk_bc;
 +	struct ve_struct	*owner_env;