- updated to 2.6.38.2

Changed files:
    kernel-grsec_full.patch -> 1.65
    kernel-vserver-2.3.patch -> 1.60
    kernel.spec -> 1.900

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 3a4c1614067bca296593d6249a3ef298d64731f5..7635862766a9213c5b8c0c1754d15969f3a9d780 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -33470,12 +33470,12 @@ diff -urNp linux-2.6.38.1/fs/proc/array.c linux-2.6.38.1/fs/proc/array.c
                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 @@ diff -urNp linux-2.6.38.1/fs/proc/task_mmu.c linux-2.6.38.1/fs/proc/task_mmu.c
                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 @@ diff -urNp linux-2.6.38.1/kernel/sysctl.c linux-2.6.38.1/kernel/sysctl.c
                .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

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index e4cd883c59218f1d3b6b3f9715da465d669d958d..58aa1eed3a37247f498891bd948604e58e3da5d2 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -7774,16 +7774,18 @@ diff -NurpP --minimal linux-2.6.38.1/fs/super.c linux-2.6.38.1-vs2.3.0.37-rc9/fs
        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 @@ diff -NurpP --minimal linux-2.6.38.1/mm/oom_kill.c linux-2.6.38.1-vs2.3.0.37-rc9
 --- 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>

diff --git a/kernel.spec b/kernel.spec
index 3236cdb2a060fdbc899e45cac0c07108307a72ab..cae1e7432cc59ae6581dd2b8faa6eac99990bd3f 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,8 +87,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
 
@@ -131,7 +131,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
 # 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