Author: glen Date: Sun Jun 10 21:03:58 2012 GMT
Module: packages Tag: LINUX_3_0
---- Log message:
- up to 3.0.34
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.85.2.13 -> 1.85.2.14) , kernel-multiarch.config
(1.77.2.7 -> 1.77.2.8) , kernel-x86.config (1.35.2.2 -> 1.35.2.3) , kernel.spec
(1.987.2.52 -> 1.987.2.53)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.85.2.13
packages/kernel/kernel-grsec_full.patch:1.85.2.14
--- packages/kernel/kernel-grsec_full.patch:1.85.2.13 Tue May 22 21:00:54 2012
+++ packages/kernel/kernel-grsec_full.patch Sun Jun 10 23:03:49 2012
@@ -39516,9 +39516,8 @@
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-3.0.9/fs/aio.c linux-3.0.9/fs/aio.c
---- linux-3.0.9/fs/aio.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/fs/aio.c 2011-11-15 20:02:59.000000000 -0500
+--- linux-3.0/fs/aio.c~ 2012-06-10 23:06:59.000000000 +0300
++++ linux-3.0/fs/aio.c 2012-06-10 23:22:51.831577737 +0300
@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -39537,7 +39536,7 @@
/* needed to zero any padding within an entry (there shouldn't be
* any, but C is fun!
*/
-@@ -1381,22 +1383,27 @@ static ssize_t aio_fsync(struct kiocb *i
+@@ -1381,18 +1381,19 @@
static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool
compat)
{
ssize_t ret;
@@ -39559,6 +39558,9 @@
&kiocb->ki_iovec);
if (ret < 0)
goto out;
+@@ -1401,6 +1402,10 @@
+ if (ret < 0)
+ goto out;
+ if (kiocb->ki_iovec == &iovstack) {
+ kiocb->ki_inline_vec = iovstack;
@@ -68194,10 +68196,9 @@
SetPageHWPoison(page);
/* keep elevated page count for bad page */
return ret;
-diff -urNp linux-3.0.9/mm/mempolicy.c linux-3.0.9/mm/mempolicy.c
---- linux-3.0.9/mm/mempolicy.c 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/mm/mempolicy.c 2011-11-15 20:03:00.000000000 -0500
-@@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct
+--- kernel-longterm-3.0.34/mm/mempolicy.c 2012-06-10 23:50:56.908064131
+0300
++++ kernel-longterm-3.0.34/mm/mempolicy.c 2012-06-10 23:50:10.725871821
+0300
+@@ -618,6 +618,10 @@
unsigned long vmstart;
unsigned long vmend;
@@ -68208,24 +68209,7 @@
vma = find_vma_prev(mm, start, &prev);
if (!vma || vma->vm_start > start)
return -EFAULT;
-@@ -669,6 +673,16 @@ static int mbind_range(struct mm_struct
- err = policy_vma(vma, new_pol);
- if (err)
- goto out;
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+ vma_m = pax_find_mirror_vma(vma);
-+ if (vma_m) {
-+ err = policy_vma(vma_m, new_pol);
-+ if (err)
-+ goto out;
-+ }
-+#endif
-+
- }
-
- out:
-@@ -1102,6 +1116,17 @@ static long do_mbind(unsigned long start
+@@ -1095,6 +1099,17 @@
if (end < start)
return -EINVAL;
@@ -68243,9 +68227,36 @@
if (end == start)
return 0;
-@@ -1320,6 +1345,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
- if (!mm)
+@@ -1322,8 +1337,7 @@
+ rcu_read_lock();
+ tcred = __task_cred(task);
+ if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
+- cred->uid != tcred->suid && cred->uid != tcred->uid &&
+- !capable(CAP_SYS_NICE)) {
++ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
+ rcu_read_unlock();
+ err = -EPERM;
goto out;
+@@ -2382,6 +2396,16 @@
+ */
+ if (!nodelist)
+ goto out;
++
++#ifdef CONFIG_PAX_SEGMEXEC
++ vma_m = pax_find_mirror_vma(vma);
++ if (vma_m) {
++ err = policy_vma(vma_m, new_pol);
++ if (err)
++ goto out;
++ }
++#endif
++
+ }
+
+ mode_flags = 0;
+@@ -2453,6 +2477,14 @@
+ unsigned short mode;
+ unsigned short flags = pol ? pol->flags : 0;
+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
+ if (mm != current->mm &&
@@ -68256,18 +68267,8 @@
+#endif
+
/*
- * Check if this process has the right to modify the specified
- * process. The right exists if the process has administrative
-@@ -1329,8 +1362,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
- rcu_read_lock();
- tcred = __task_cred(task);
- if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
-- cred->uid != tcred->suid && cred->uid != tcred->uid &&
-- !capable(CAP_SYS_NICE)) {
-+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
- rcu_read_unlock();
- err = -EPERM;
- goto out;
+ * Sanity check: room for longest mode, flag and some nodes
+ */
diff -urNp linux-3.0.9/mm/migrate.c linux-3.0.9/mm/migrate.c
--- linux-3.0.9/mm/migrate.c 2011-11-11 13:12:24.000000000 -0500
+++ linux-3.0.9/mm/migrate.c 2011-11-15 20:03:00.000000000 -0500
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.77.2.7
packages/kernel/kernel-multiarch.config:1.77.2.8
--- packages/kernel/kernel-multiarch.config:1.77.2.7 Mon Apr 23 12:09:57 2012
+++ packages/kernel/kernel-multiarch.config Sun Jun 10 23:03:50 2012
@@ -687,9 +687,10 @@
GPIO_MAX732X all=m
GPIO_PCA953X all=m
GPIO_PCF857X all=m
-GPIO_SX150X all=m
+GPIO_SX150X all=y
GPIO_TWL4030 powerpc=m
GPIO_WM831X all=m
+GPIO_WM8350 all=m
GPIO_WM8994 all=m
GPIO_ADP5588 all=m
#- PCI GPIO expanders:
@@ -2374,7 +2375,7 @@
TPS6105X all=m
TPS65010 all=m
TPS6507X all=m
-MFD_TPS6586X all=m
+MFD_TPS6586X all=y
TWL4030_CORE powerpc=y
PMIC_DA903X powerpc=y
MFD_WM8400 all=m
@@ -5657,6 +5658,7 @@
ITCO_VENDOR_SUPPORT all=y
IT8712F_WDT all=m
IT87_WDT all=m
+INTEL_SCU_WATCHDOG all=n
HP_WATCHDOG all=m
HPWDT_NMI_DECODING all=y
SC1200_WDT i386=m x86_64=m
================================================================
Index: packages/kernel/kernel-x86.config
diff -u packages/kernel/kernel-x86.config:1.35.2.2
packages/kernel/kernel-x86.config:1.35.2.3
--- packages/kernel/kernel-x86.config:1.35.2.2 Sun Nov 27 13:43:45 2011
+++ packages/kernel/kernel-x86.config Sun Jun 10 23:03:50 2012
@@ -28,9 +28,11 @@
X86_NUMAQ i386=n
X86_VISWS i386=n
X86_SUMMIT i386=n
-X86_ES7000 i386=n
+X86_ES7000 x86=n
+X86_32_IRIS i386=m
SCHED_OMIT_FRAME_POINTER i386=y x86_64=y
PARAVIRT_GUEST x86=y
+LGUEST_GUEST x86=y
#- file arch/x86/xen/Kconfig goes here
KVM_CLOCK x86=y
KVM_GUEST x86=y
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.987.2.52
packages/kernel/kernel.spec:1.987.2.53
--- packages/kernel/kernel.spec:1.987.2.52 Wed May 23 11:49:51 2012
+++ packages/kernel/kernel.spec Sun Jun 10 23:03:50 2012
@@ -94,7 +94,7 @@
%endif
%define basever 3.0
-%define postver .32
+%define postver .34
%define rel 1
%define _enable_debug_packages 0
@@ -141,7 +141,7 @@
# Source0-md5: ecf932280e2441bdd992423ef3d55f8f
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5: 8d32acd70065f6b76495a80901320f6c
+# Patch0-md5: c6389181e178a0ebba50011685b8c7d5
%endif
Source3: kernel-autoconf.h
@@ -1556,6 +1556,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.987.2.53 2012/06/10 21:03:50 glen
+- up to 3.0.34
+
Revision 1.987.2.52 2012/05/23 09:49:51 baggins
- use the --force, dracut
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/kernel/kernel-grsec_full.patch?r1=1.85.2.13&r2=1.85.2.14
http://cvs.pld-linux.org/packages/kernel/kernel-multiarch.config?r1=1.77.2.7&r2=1.77.2.8
http://cvs.pld-linux.org/packages/kernel/kernel-x86.config?r1=1.35.2.2&r2=1.35.2.3
http://cvs.pld-linux.org/packages/kernel/kernel.spec?r1=1.987.2.52&r2=1.987.2.53
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
