- updated to 2.6.38.4

Changed files:
    kernel-grsec_full.patch -> 1.68
    kernel-multiarch.config -> 1.67
    kernel-vserver-2.3.patch -> 1.64
    kernel.spec -> 1.908

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 00ccfa796f42c16aa03fb09961d437c6c1cf4b08..62c91a151aca8f4a157eb7ef5b19272132990caa 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -26392,22 +26392,6 @@ diff -urNp linux-2.6.38.3/drivers/media/rc/lirc_dev.c linux-2.6.38.3/drivers/med
        .owner          = THIS_MODULE,
        .read           = lirc_dev_fop_read,
        .write          = lirc_dev_fop_write,
-diff -urNp linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c
---- linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c  2011-03-14 21:20:32.000000000 -0400
-+++ linux-2.6.38.3/drivers/media/video/sn9c102/sn9c102_core.c  2011-04-17 15:57:32.000000000 -0400
-@@ -1430,9 +1430,9 @@ static DEVICE_ATTR(i2c_reg, S_IRUGO | S_
-                  sn9c102_show_i2c_reg, sn9c102_store_i2c_reg);
- static DEVICE_ATTR(i2c_val, S_IRUGO | S_IWUSR,
-                  sn9c102_show_i2c_val, sn9c102_store_i2c_val);
--static DEVICE_ATTR(green, S_IWUGO, NULL, sn9c102_store_green);
--static DEVICE_ATTR(blue, S_IWUGO, NULL, sn9c102_store_blue);
--static DEVICE_ATTR(red, S_IWUGO, NULL, sn9c102_store_red);
-+static DEVICE_ATTR(green, S_IWUSR, NULL, sn9c102_store_green);
-+static DEVICE_ATTR(blue, S_IWUSR, NULL, sn9c102_store_blue);
-+static DEVICE_ATTR(red, S_IWUSR, NULL, sn9c102_store_red);
- static DEVICE_ATTR(frame_header, S_IRUGO, sn9c102_show_frame_header, NULL);
- 
- 
 diff -urNp linux-2.6.38.3/drivers/message/fusion/mptbase.c linux-2.6.38.3/drivers/message/fusion/mptbase.c
 --- linux-2.6.38.3/drivers/message/fusion/mptbase.c    2011-03-14 21:20:32.000000000 -0400
 +++ linux-2.6.38.3/drivers/message/fusion/mptbase.c    2011-04-17 15:57:32.000000000 -0400
@@ -34665,8 +34649,8 @@ diff -urNp linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3/fs/proc/base.c
        return result;
 @@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp,
  {
-       unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
-       struct task_struct *reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
+       unsigned int nr;
+       struct task_struct *reaper;
 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
 +      const struct cred *tmpcred = current_cred();
 +      const struct cred *itercred;
@@ -35547,32 +35531,6 @@ diff -urNp linux-2.6.38.3/fs/sysfs/symlink.c linux-2.6.38.3/fs/sysfs/symlink.c
        if (!IS_ERR(page))
                free_page((unsigned long)page);
  }
-diff -urNp linux-2.6.38.3/fs/ubifs/debug.c linux-2.6.38.3/fs/ubifs/debug.c
---- linux-2.6.38.3/fs/ubifs/debug.c    2011-04-17 16:53:01.000000000 -0400
-+++ linux-2.6.38.3/fs/ubifs/debug.c    2011-04-17 16:53:48.000000000 -0400
-@@ -2844,19 +2844,19 @@ int dbg_debugfs_init_fs(struct ubifs_inf
-       }
- 
-       fname = "dump_lprops";
--      dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops);
-+      dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops);
-       if (IS_ERR(dent))
-               goto out_remove;
-       d->dfs_dump_lprops = dent;
- 
-       fname = "dump_budg";
--      dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops);
-+      dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops);
-       if (IS_ERR(dent))
-               goto out_remove;
-       d->dfs_dump_budg = dent;
- 
-       fname = "dump_tnc";
--      dent = debugfs_create_file(fname, S_IWUGO, d->dfs_dir, c, &dfs_fops);
-+      dent = debugfs_create_file(fname, S_IWUSR, d->dfs_dir, c, &dfs_fops);
-       if (IS_ERR(dent))
-               goto out_remove;
-       d->dfs_dump_tnc = dent;
 diff -urNp linux-2.6.38.3/fs/udf/misc.c linux-2.6.38.3/fs/udf/misc.c
 --- linux-2.6.38.3/fs/udf/misc.c       2011-03-14 21:20:32.000000000 -0400
 +++ linux-2.6.38.3/fs/udf/misc.c       2011-04-17 15:57:32.000000000 -0400
@@ -54677,33 +54635,6 @@ diff -urNp linux-2.6.38.3/mm/mlock.c linux-2.6.38.3/mm/mlock.c
  #include <linux/sched.h>
  #include <linux/module.h>
  #include <linux/rmap.h>
-@@ -135,13 +136,6 @@ void munlock_vma_page(struct page *page)
-       }
- }
- 
--static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
--{
--      return (vma->vm_flags & VM_GROWSDOWN) &&
--              (vma->vm_start == addr) &&
--              !vma_stack_continue(vma->vm_prev, addr);
--}
--
- /**
-  * __mlock_vma_pages_range() -  mlock a range of pages in the vma.
-  * @vma:   target vma
-@@ -188,12 +182,6 @@ static long __mlock_vma_pages_range(stru
-       if (vma->vm_flags & VM_LOCKED)
-               gup_flags |= FOLL_MLOCK;
- 
--      /* We don't try to access the guard page of a stack vma */
--      if (stack_guard_page(vma, start)) {
--              addr += PAGE_SIZE;
--              nr_pages--;
--      }
--
-       return __get_user_pages(current, mm, addr, nr_pages, gup_flags,
-                               NULL, NULL, nonblocking);
- }
 @@ -393,6 +381,9 @@ static int do_mlock(unsigned long start,
                return -EINVAL;
        if (end == start)
@@ -55554,20 +55485,21 @@ diff -urNp linux-2.6.38.3/mm/mmap.c linux-2.6.38.3/mm/mmap.c
                size = vma->vm_end - address;
                grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -1818,10 +2100,21 @@ static int expand_downwards(struct vm_ar
-               if (!error) {
-                       vma->vm_start = address;
-                       vma->vm_pgoff -= grow;
-+                      track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
+@@ -1818,11 +2100,22 @@ static int expand_downwards(struct vm_ar
+                       if (!error) {
+                               vma->vm_start = address;
+                               vma->vm_pgoff -= grow;
++                              track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
-+                      if (vma_m) {
-+                              vma_m->vm_start -= grow << PAGE_SHIFT;
-+                              vma_m->vm_pgoff -= grow;
-+                      }
++                              if (vma_m) {
++                                      vma_m->vm_start -= grow << PAGE_SHIFT;
++                                      vma_m->vm_pgoff -= grow;
++                              }
 +#endif
 +
-                       perf_event_mmap(vma);
+                               perf_event_mmap(vma);
+                       }
                }
        }
        vma_unlock_anon_vma(vma);

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 2853be5b124c72ea6da11468b550523482aa9b02..7e1a8b4f4e26e2c6755017269117633492b1b731 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -6333,6 +6333,7 @@ DYNAMIC_DEBUG all=n
 DMA_API_DEBUG all=n
 ATOMIC64_SELFTEST all=n
 ASYNC_RAID6_TEST all=m
+TEST_KSTRTOX all=m
 #- file samples/Kconfig goes here
 #- file lib/Kconfig.kgdb goes here
 #- file lib/Kconfig.kmemcheck goes here

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index b6a8c80a80a0473abaa875f3c88893deec6102a1..205349e5f6051d14cf5f1c42b71951d3c5c164c4 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -7030,13 +7030,13 @@ diff -NurpP --minimal linux-2.6.38.3/fs/proc/base.c linux-2.6.38.3-vs2.3.0.37-rc
                                proc_pid_instantiate, iter.task, NULL);
  }
 @@ -3067,7 +3098,7 @@ static int proc_pid_fill_cache(struct fi
- int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
- {
-       unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
--      struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode);
-+      struct task_struct *reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
-       struct tgid_iter iter;
-       struct pid_namespace *ns;
+               goto out_no_task;
+       nr = filp->f_pos - FIRST_PROCESS_ENTRY;
+ 
+-      reaper = get_proc_task(filp->f_path.dentry->d_inode);
++      reaper = get_proc_task_real(filp->f_path.dentry->d_inode);
+       if (!reaper)
+               goto out_no_task;
  
 @@ -3087,6 +3118,8 @@ int proc_pid_readdir(struct file * filp,
             iter.task;
@@ -24780,14 +24780,14 @@ diff -NurpP --minimal linux-2.6.38.3/net/bridge/br_multicast.c linux-2.6.38.3-vs
 --- linux-2.6.38.3/net/bridge/br_multicast.c   2011-03-15 18:07:44.000000000 +0100
 +++ linux-2.6.38.3-vs2.3.0.37-rc14/net/bridge/br_multicast.c   2011-03-10 16:51:08.000000000 +0100
 @@ -446,7 +446,7 @@ static struct sk_buff *br_ip6_multicast_
-       ip6h->nexthdr = IPPROTO_HOPOPTS;
        ip6h->hop_limit = 1;
+       ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
        ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0,
 -                         &ip6h->saddr);
 +                         &ip6h->saddr, NULL);
-       ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
        ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
  
+       hopopt = (u8 *)(ip6h + 1);
 diff -NurpP --minimal linux-2.6.38.3/net/core/dev.c linux-2.6.38.3-vs2.3.0.37-rc14/net/core/dev.c
 --- linux-2.6.38.3/net/core/dev.c      2011-03-15 18:07:44.000000000 +0100
 +++ linux-2.6.38.3-vs2.3.0.37-rc14/net/core/dev.c      2011-03-15 18:15:06.000000000 +0100

diff --git a/kernel.spec b/kernel.spec
index 7e857bc06fbaed45aba382ce81915f443c798650..1ac153e5a8b2cefd1e90c6f084c7f712adaf3ade 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@
 %endif
 
 %define                basever         2.6.38
-%define                postver         .3
+%define                postver         .4
 %define                rel             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: b3677121c4b5efcb8128c2000788d0aa
+# Source1-md5: 6ef1279c7bd0078fc0fd50aa83e86203
 %endif
 
 Source3:       kernel-autoconf.h