[kernel] r16840 - dists/lenny-security/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Thu Jan 20 06:48:57 2011
New Revision: 16840

Log:
Port to apply on top of the CVE-2010-4249 fixes

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

Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Wed Jan 19 13:41:39 2011	(r16839)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Thu Jan 20 06:48:57 2011	(r16840)
@@ -72419,15 +72419,15 @@
  		if (!fpl)
  			return -ENOMEM;
  		*fplp = fpl;
-@@ -282,7 +285,7 @@ struct scm_fp_list *scm_fp_dup(struct scm_fp_list *fpl)
- 	if (!fpl)
+@@ -301,7 +304,7 @@ struct scm_fp_list *scm_fp_dup(struct sc
  		return NULL;
  
--	new_fpl = kmalloc(sizeof(*fpl), GFP_KERNEL);
-+	new_fpl = kmalloc(sizeof(*fpl), GFP_KERNEL_UBC);
+ 	new_fpl = kmemdup(fpl, offsetof(struct scm_fp_list, fp[fpl->count]),
+-			  GFP_KERNEL);
++			  GFP_KERNEL_UBC);
  	if (new_fpl) {
  		INIT_LIST_HEAD(&new_fpl->list);
- 		for (i=fpl->count-1; i>=0; i--)
+ 		for (i = 0; i < fpl->count; i++)
 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
 index 3666216..b82442c 100644
 --- a/net/core/skbuff.c