packages: kernel/kernel-grsec_full.patch, kernel/kernel-vserver-2.3.patch, ...

[baggins]

Author: baggins                      Date: Mon Mar 28 06:15:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.6.38.2

---- Files affected:
packages/kernel:
   kernel-grsec_full.patch (1.64 -> 1.65) , kernel-vserver-2.3.patch (1.59 -> 1.60) , kernel.spec (1.899 -> 1.900) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.64 packages/kernel/kernel-grsec_full.patch:1.65
--- packages/kernel/kernel-grsec_full.patch:1.64	Sun Mar 27 11:46:29 2011
+++ packages/kernel/kernel-grsec_full.patch	Mon Mar 28 08:15:34 2011
@@ -33470,12 +33470,12 @@
  		mm ? get_mm_rss(mm) : 0,
  		rsslim,
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+		PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0),
-+		PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0),
++		PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
++		PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
 +		PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
 +#else
- 		mm ? mm->start_code : 0,
- 		mm ? mm->end_code : 0,
+ 		mm ? (permitted ? mm->start_code : 1) : 0,
+ 		mm ? (permitted ? mm->end_code : 1) : 0,
  		(permitted && mm) ? mm->start_stack : 0,
 +#endif
  		esp,
@@ -34274,8 +34274,8 @@
  		const char *name = arch_vma_name(vma);
  		if (!name) {
  			if (mm) {
--				if (vma->vm_start <= mm->start_brk &&
--						vma->vm_end >= mm->brk) {
+-				if (vma->vm_start <= mm->brk &&
+-						vma->vm_end >= mm->start_brk) {
 +				if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  					name = "[heap]";
 -				} else if (vma->vm_start <= mm->start_stack &&
@@ -51736,7 +51736,7 @@
  		.data		= &kptr_restrict,
  		.maxlen		= sizeof(int),
  		.mode		= 0644,
- 		.proc_handler	= proc_dointvec_minmax,
+ 		.proc_handler	= proc_dmesg_restrict,
 +#ifdef CONFIG_GRKERNSEC_HIDESYM
 +		.extra1		= &two,
 +#else

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.59 packages/kernel/kernel-vserver-2.3.patch:1.60
--- packages/kernel/kernel-vserver-2.3.patch:1.59	Sun Mar 27 11:46:29 2011
+++ packages/kernel/kernel-vserver-2.3.patch	Mon Mar 28 08:15:34 2011
@@ -7774,16 +7774,18 @@
  	error = -ENOMEM;
  	mnt = alloc_vfsmnt(name);
  	if (!mnt)
-@@ -1001,11 +1010,19 @@ vfs_kern_mount(struct file_system_type *
+@@ -1001,12 +1010,20 @@ vfs_kern_mount(struct file_system_type *
  		if (error < 0)
  			goto out_free_secdata;
  	}
 -	BUG_ON(!mnt->mnt_sb);
 -	WARN_ON(!mnt->mnt_sb->s_bdi);
+-	WARN_ON(mnt->mnt_sb->s_bdi == &default_backing_dev_info);
 +
 +	sb = mnt->mnt_sb;
 +	BUG_ON(!sb);
 +	WARN_ON(!sb->s_bdi);
++	WARN_ON(sb->s_bdi == &default_backing_dev_info);
  	mnt->mnt_sb->s_flags |= MS_BORN;
  
 -	error = security_sb_kern_mount(mnt->mnt_sb, flags, secdata);
@@ -24412,9 +24414,9 @@
 --- linux-2.6.38.1/mm/oom_kill.c	2011-01-05 21:50:40.000000000 +0100
 +++ linux-2.6.38.1-vs2.3.0.37-rc9/mm/oom_kill.c	2011-01-29 02:01:07.000000000 +0100
 @@ -31,6 +31,9 @@
- #include <linux/memcontrol.h>
  #include <linux/mempolicy.h>
  #include <linux/security.h>
+ #include <linux/ptrace.h>
 +#include <linux/reboot.h>
 +#include <linux/vs_memory.h>
 +#include <linux/vs_context.h>

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.899 packages/kernel/kernel.spec:1.900
--- packages/kernel/kernel.spec:1.899	Sun Mar 27 11:46:29 2011
+++ packages/kernel/kernel.spec	Mon Mar 28 08:15:35 2011
@@ -88,8 +88,8 @@
 %endif
 
 %define		basever		2.6.38
-%define		postver		.1
-%define		rel		1
+%define		postver		.2
+%define		rel		0.1
 
 %define		_enable_debug_packages			0
 
@@ -132,7 +132,7 @@
 # Source0-md5:	7d471477bfa67546f902da62227fa976
 %if "%{postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5:	bd2be4d0465345e4e9355d6773f5f6fe
+# Source1-md5:	599badab31c4920d4122133208c810d7
 %endif
 
 Source3:	kernel-autoconf.h
@@ -1524,6 +1524,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.900  2011/03/28 06:15:35  baggins
+- updated to 2.6.38.2
+
 Revision 1.899  2011/03/27 09:46:29  arekm
 - rel 1; update vserver to patch-2.6.38.1-vs2.3.0.37-rc9.dif; up grsec to grsecurity-2.2.2-2.6.38.1-201103262052.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.64&r2=1.65&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.59&r2=1.60&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.899&r2=1.900&f=u