Author: baggins Date: Sat Apr 23 08:30:11 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.6.38.4
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.67 -> 1.68) , kernel-multiarch.config (1.66 ->
1.67) , kernel-vserver-2.3.patch (1.63 -> 1.64) , kernel.spec (1.907 -> 1.908)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.67
packages/kernel/kernel-grsec_full.patch:1.68
--- packages/kernel/kernel-grsec_full.patch:1.67 Mon Apr 18 09:55:27 2011
+++ packages/kernel/kernel-grsec_full.patch Sat Apr 23 10:30:05 2011
@@ -26392,22 +26392,6 @@
.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 @@
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 @@
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 @@
#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 @@
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);
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.66
packages/kernel/kernel-multiarch.config:1.67
--- packages/kernel/kernel-multiarch.config:1.66 Mon Apr 18 18:24:57 2011
+++ packages/kernel/kernel-multiarch.config Sat Apr 23 10:30:05 2011
@@ -6333,6 +6333,7 @@
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
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.63
packages/kernel/kernel-vserver-2.3.patch:1.64
--- packages/kernel/kernel-vserver-2.3.patch:1.63 Mon Apr 18 09:55:27 2011
+++ packages/kernel/kernel-vserver-2.3.patch Sat Apr 23 10:30:05 2011
@@ -7030,13 +7030,13 @@
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 @@
--- 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
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.907 packages/kernel/kernel.spec:1.908
--- packages/kernel/kernel.spec:1.907 Mon Apr 18 09:55:28 2011
+++ packages/kernel/kernel.spec Sat Apr 23 10:30:05 2011
@@ -88,7 +88,7 @@
%endif
%define basever 2.6.38
-%define postver .3
+%define postver .4
%define rel 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: b3677121c4b5efcb8128c2000788d0aa
+# Source1-md5: 6ef1279c7bd0078fc0fd50aa83e86203
%endif
Source3: kernel-autoconf.h
@@ -1532,6 +1532,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.908 2011/04/23 08:30:05 baggins
+- updated to 2.6.38.4
+
Revision 1.907 2011/04/18 07:55:28 arekm
- grsec & vserver updated
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.67&r2=1.68&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.66&r2=1.67&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.63&r2=1.64&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.907&r2=1.908&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
