packages: kernel/kernel-grsec_full.patch, kernel/kernel-vserver-2.3.patch, ...
arekm
arekm at pld-linux.org
Tue Oct 6 09:05:58 CEST 2009
Author: arekm Date: Tue Oct 6 07:05:58 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.6.31.2; up vserver to 2.6.31.2-vs2.3.0.36.15 (big sched_hard changes)
---- Files affected:
packages/kernel:
kernel-grsec_full.patch (1.17 -> 1.18) , kernel-vserver-2.3.patch (1.19 -> 1.20) , kernel-vserver-fixes.patch (1.5 -> 1.6) , kernel-vserver.config (1.3 -> 1.4) , kernel.spec (1.712 -> 1.713) , kernel-intel-gpu-fifo.patch (1.1 -> NONE) (REMOVED), kernel-intel-pre-9xx.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kernel/kernel-grsec_full.patch
diff -u packages/kernel/kernel-grsec_full.patch:1.17 packages/kernel/kernel-grsec_full.patch:1.18
--- packages/kernel/kernel-grsec_full.patch:1.17 Thu Sep 24 21:26:46 2009
+++ packages/kernel/kernel-grsec_full.patch Tue Oct 6 09:05:52 2009
@@ -15559,7 +15559,7 @@
@@ -36,7 +36,7 @@
* Leave an at least ~128 MB hole.
*/
- #define MIN_GAP (128*1024*1024)
+ #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
-#define MAX_GAP (TASK_SIZE/6*5)
+#define MAX_GAP (pax_task_size/6*5)
@@ -19530,13 +19530,13 @@
else if (cs->mstate != MS_LOCKED) {
dev_warn(cs->dev, "can't write to unlocked device\n");
@@ -429,7 +427,7 @@ static int if_chars_in_buffer(struct tty
- if (!cs->connected) {
+
+ if (!cs->connected)
gig_dbg(DEBUG_IF, "not connected");
- retval = -ENODEV;
-- } else if (!cs->open_count)
-+ } else if (!atomic_read(&cs->open_count))
+- else if (!cs->open_count)
++ else if (!atomic_read(&cs->open_count))
dev_warn(cs->dev, "%s: device not opened\n", __func__);
- else if (cs->mstate != MS_LOCKED) {
+ else if (cs->mstate != MS_LOCKED)
dev_warn(cs->dev, "can't write to unlocked device\n");
@@ -458,7 +456,7 @@ static void if_throttle(struct tty_struc
@@ -40836,102 +40836,102 @@
--- linux-2.6.31/kernel/sys.c 2009-08-27 20:59:04.000000000 -0400
+++ linux-2.6.31/kernel/sys.c 2009-09-06 15:29:12.167024518 -0400
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
- error = -EACCES;
- goto out;
- }
+ error = -EACCES;
+ goto out;
+ }
+
-+ if (gr_handle_chroot_setpriority(p, niceval)) {
-+ error = -EACCES;
-+ goto out;
-+ }
++ if (gr_handle_chroot_setpriority(p, niceval)) {
++ error = -EACCES;
++ goto out;
++ }
+
- no_nice = security_task_setnice(p, niceval);
- if (no_nice) {
- error = no_nice;
+ no_nice = security_task_setnice(p, niceval);
+ if (no_nice) {
+ error = no_nice;
@@ -509,6 +515,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
- goto error;
- }
+ goto error;
+ }
+ if (gr_check_group_change(new->gid, new->egid, -1))
+ goto error;
+
- if (rgid != (gid_t) -1 ||
- (egid != (gid_t) -1 && egid != old->gid))
- new->sgid = new->egid;
+ if (rgid != (gid_t) -1 ||
+ (egid != (gid_t) -1 && egid != old->gid))
+ new->sgid = new->egid;
@@ -542,6 +551,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
- goto error;
+ goto error;
- retval = -EPERM;
+ retval = -EPERM;
+
-+ if (gr_check_group_change(gid, gid, gid))
-+ goto error;
++ if (gr_check_group_change(gid, gid, gid))
++ goto error;
+
- if (capable(CAP_SETGID))
- new->gid = new->egid = new->sgid = new->fsgid = gid;
- else if (gid == old->gid || gid == old->sgid)
+ if (capable(CAP_SETGID))
+ new->gid = new->egid = new->sgid = new->fsgid = gid;
+ else if (gid == old->gid || gid == old->sgid)
@@ -632,6 +645,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
- goto error;
- }
+ goto error;
+ }
-+ if (gr_check_user_change(new->uid, new->euid, -1))
-+ goto error;
++ if (gr_check_user_change(new->uid, new->euid, -1))
++ goto error;
+
- if (new->uid != old->uid) {
- retval = set_user(new);
- if (retval < 0)
+ if (new->uid != old->uid) {
+ retval = set_user(new);
+ if (retval < 0)
@@ -680,6 +696,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
- goto error;
+ goto error;
- retval = -EPERM;
+ retval = -EPERM;
+
-+ if (gr_check_crash_uid(uid))
-+ goto error;
-+ if (gr_check_user_change(uid, uid, uid))
-+ goto error;
++ if (gr_check_crash_uid(uid))
++ goto error;
++ if (gr_check_user_change(uid, uid, uid))
++ goto error;
+
- if (capable(CAP_SETUID)) {
- new->suid = new->uid = uid;
- if (uid != old->uid) {
+ if (capable(CAP_SETUID)) {
+ new->suid = new->uid = uid;
+ if (uid != old->uid) {
@@ -737,6 +759,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid,
- goto error;
- }
+ goto error;
+ }
-+ if (gr_check_user_change(ruid, euid, -1))
-+ goto error;
++ if (gr_check_user_change(ruid, euid, -1))
++ goto error;
+
- if (ruid != (uid_t) -1) {
- new->uid = ruid;
- if (ruid != old->uid) {
+ if (ruid != (uid_t) -1) {
+ new->uid = ruid;
+ if (ruid != old->uid) {
@@ -805,6 +830,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid,
- goto error;
- }
+ goto error;
+ }
-+ if (gr_check_group_change(rgid, egid, -1))
-+ goto error;
++ if (gr_check_group_change(rgid, egid, -1))
++ goto error;
+
- if (rgid != (gid_t) -1)
- new->gid = rgid;
- if (egid != (gid_t) -1)
+ if (rgid != (gid_t) -1)
+ new->gid = rgid;
+ if (egid != (gid_t) -1)
@@ -854,6 +882,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
- if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
- goto error;
+ if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
+ goto error;
-+ if (gr_check_user_change(-1, -1, uid))
-+ goto error;
++ if (gr_check_user_change(-1, -1, uid))
++ goto error;
+
- if (uid == old->uid || uid == old->euid ||
- uid == old->suid || uid == old->fsuid ||
- capable(CAP_SETUID)) {
+ if (uid == old->uid || uid == old->euid ||
+ uid == old->suid || uid == old->fsuid ||
+ capable(CAP_SETUID)) {
@@ -894,6 +925,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
- if (gid == old->gid || gid == old->egid ||
- gid == old->sgid || gid == old->fsgid ||
- capable(CAP_SETGID)) {
-+ if (gr_check_group_change(-1, -1, gid))
-+ goto error;
-+
- if (gid != old_fsgid) {
- new->fsgid = gid;
- goto change_okay;
+ if (gid == old->gid || gid == old->egid ||
+ gid == old->sgid || gid == old->fsgid ||
+ capable(CAP_SETGID)) {
++ if (gr_check_group_change(-1, -1, gid))
++ goto error;
++
+ if (gid != old_fsgid) {
+ new->fsgid = gid;
+ goto change_okay;
@@ -1443,7 +1477,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
error = get_dumpable(me->mm);
break;
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.19 packages/kernel/kernel-vserver-2.3.patch:1.20
--- packages/kernel/kernel-vserver-2.3.patch:1.19 Fri Sep 18 14:39:07 2009
+++ packages/kernel/kernel-vserver-2.3.patch Tue Oct 6 09:05:52 2009
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.31/arch/alpha/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/Kconfig
---- linux-2.6.31/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/Kconfig 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/alpha/Kconfig linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/Kconfig
+--- linux-2.6.31.2/arch/alpha/Kconfig 2009-03-24 14:18:07.000000000 +0100
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +10,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/entry.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/entry.S
---- linux-2.6.31/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/entry.S 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/alpha/kernel/entry.S linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/entry.S
+--- linux-2.6.31.2/arch/alpha/kernel/entry.S 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/entry.S 2009-09-10 16:11:43.000000000 +0200
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.ent sys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/osf_sys.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/osf_sys.c
---- linux-2.6.31/arch/alpha/kernel/osf_sys.c 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/osf_sys.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/alpha/kernel/osf_sys.c linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.31.2/arch/alpha/kernel/osf_sys.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/osf_sys.c 2009-09-10 16:11:43.000000000 +0200
@@ -872,7 +872,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/ptrace.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/ptrace.c
---- linux-2.6.31/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/alpha/kernel/ptrace.c linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/ptrace.c
+--- linux-2.6.31.2/arch/alpha/kernel/ptrace.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/security.h>
@@ -68,9 +68,9 @@
#include <asm/uaccess.h>
#include <asm/pgtable.h>
-diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/systbls.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/systbls.S
---- linux-2.6.31/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/systbls.S 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/alpha/kernel/systbls.S linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/systbls.S
+--- linux-2.6.31.2/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.000000000 +0100
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/systbls.S 2009-09-10 16:11:43.000000000 +0200
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64 /* 425 */
.quad sys_lstat64
@@ -80,9 +80,9 @@
.quad sys_ni_syscall /* sys_mbind */
.quad sys_ni_syscall /* sys_get_mempolicy */
.quad sys_ni_syscall /* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.31/arch/alpha/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/traps.c
---- linux-2.6.31/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/alpha/kernel/traps.c linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/traps.c
+--- linux-2.6.31.2/arch/alpha/kernel/traps.c 2009-06-11 17:11:46.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -93,9 +93,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.31/arch/alpha/mm/fault.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/mm/fault.c
---- linux-2.6.31/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/alpha/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/alpha/mm/fault.c linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/mm/fault.c
+--- linux-2.6.31.2/arch/alpha/mm/fault.c 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/alpha/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
@@ -193,8 +193,8 @@ do_page_fault(unsigned long address, uns
down_read(&mm->mmap_sem);
goto survive;
@@ -107,9 +107,9 @@
if (!user_mode(regs))
goto no_context;
do_group_exit(SIGKILL);
-diff -NurpP --minimal linux-2.6.31/arch/arm/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/Kconfig
---- linux-2.6.31/arch/arm/Kconfig 2009-09-10 15:25:14.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/Kconfig 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/arm/Kconfig linux-2.6.31.2-vs2.3.0.36.15/arch/arm/Kconfig
+--- linux-2.6.31.2/arch/arm/Kconfig 2009-09-10 15:25:14.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/arm/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -1483,6 +1483,8 @@ source "fs/Kconfig"
source "arch/arm/Kconfig.debug"
@@ -119,9 +119,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.31/arch/arm/kernel/calls.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/calls.S
---- linux-2.6.31/arch/arm/kernel/calls.S 2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/calls.S 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/arm/kernel/calls.S linux-2.6.31.2-vs2.3.0.36.15/arch/arm/kernel/calls.S
+--- linux-2.6.31.2/arch/arm/kernel/calls.S 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/arm/kernel/calls.S 2009-09-10 16:11:43.000000000 +0200
@@ -322,7 +322,7 @@
/* 310 */ CALL(sys_request_key)
CALL(sys_keyctl)
@@ -131,9 +131,9 @@
CALL(sys_ioprio_set)
/* 315 */ CALL(sys_ioprio_get)
CALL(sys_inotify_init)
-diff -NurpP --minimal linux-2.6.31/arch/arm/kernel/process.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/process.c
---- linux-2.6.31/arch/arm/kernel/process.c 2009-09-10 15:25:15.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/process.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/arm/kernel/process.c linux-2.6.31.2-vs2.3.0.36.15/arch/arm/kernel/process.c
+--- linux-2.6.31.2/arch/arm/kernel/process.c 2009-09-10 15:25:15.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/arm/kernel/process.c 2009-09-10 16:11:43.000000000 +0200
@@ -269,7 +269,8 @@ void __show_regs(struct pt_regs *regs)
void show_regs(struct pt_regs * regs)
{
@@ -144,9 +144,9 @@
__show_regs(regs);
__backtrace();
}
-diff -NurpP --minimal linux-2.6.31/arch/arm/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/traps.c
---- linux-2.6.31/arch/arm/kernel/traps.c 2009-06-11 17:11:49.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/arm/kernel/traps.c linux-2.6.31.2-vs2.3.0.36.15/arch/arm/kernel/traps.c
+--- linux-2.6.31.2/arch/arm/kernel/traps.c 2009-06-11 17:11:49.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/arm/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -228,8 +228,8 @@ static void __die(const char *str, int e
str, err, ++die_counter);
print_modules();
@@ -158,9 +158,9 @@
if (!user_mode(regs) || in_interrupt()) {
dump_mem("Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-2.6.31/arch/arm/mm/fault.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/mm/fault.c
---- linux-2.6.31/arch/arm/mm/fault.c 2009-09-10 15:25:18.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/arm/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/arm/mm/fault.c linux-2.6.31.2-vs2.3.0.36.15/arch/arm/mm/fault.c
+--- linux-2.6.31.2/arch/arm/mm/fault.c 2009-09-10 15:25:18.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/arm/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
@@ -294,7 +294,8 @@ do_page_fault(unsigned long addr, unsign
* happened to us that made us unable to handle
* the page fault gracefully.
@@ -171,9 +171,22 @@
do_group_exit(SIGKILL);
return 0;
}
-diff -NurpP --minimal linux-2.6.31/arch/cris/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/cris/Kconfig
---- linux-2.6.31/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/cris/Kconfig 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/avr32/mm/fault.c linux-2.6.31.2-vs2.3.0.36.15/arch/avr32/mm/fault.c
+--- linux-2.6.31.2/arch/avr32/mm/fault.c 2009-09-10 15:25:20.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/avr32/mm/fault.c 2009-09-29 17:32:09.000000000 +0200
+@@ -216,7 +216,8 @@ out_of_memory:
+ down_read(&mm->mmap_sem);
+ goto survive;
+ }
+- printk("VM: Killing process %s\n", tsk->comm);
++ printk("VM: Killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+ goto no_context;
+diff -NurpP --minimal linux-2.6.31.2/arch/cris/Kconfig linux-2.6.31.2-vs2.3.0.36.15/arch/cris/Kconfig
+--- linux-2.6.31.2/arch/cris/Kconfig 2009-06-11 17:11:56.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/cris/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -685,6 +685,8 @@ source "drivers/staging/Kconfig"
source "arch/cris/Kconfig.debug"
@@ -183,9 +196,22 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.31/arch/frv/kernel/kernel_thread.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/frv/kernel/kernel_thread.S
---- linux-2.6.31/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/frv/kernel/kernel_thread.S 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/cris/mm/fault.c linux-2.6.31.2-vs2.3.0.36.15/arch/cris/mm/fault.c
+--- linux-2.6.31.2/arch/cris/mm/fault.c 2009-09-10 15:25:21.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/cris/mm/fault.c 2009-09-29 17:25:13.000000000 +0200
+@@ -245,7 +245,8 @@ do_page_fault(unsigned long address, str
+
+ out_of_memory:
+ up_read(&mm->mmap_sem);
+- printk("VM: killing process %s\n", tsk->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (user_mode(regs))
+ do_exit(SIGKILL);
+ goto no_context;
+diff -NurpP --minimal linux-2.6.31.2/arch/frv/kernel/kernel_thread.S linux-2.6.31.2-vs2.3.0.36.15/arch/frv/kernel/kernel_thread.S
+--- linux-2.6.31.2/arch/frv/kernel/kernel_thread.S 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/frv/kernel/kernel_thread.S 2009-09-10 16:11:43.000000000 +0200
@@ -37,7 +37,7 @@ kernel_thread:
# start by forking the current process, but with shared VM
@@ -195,9 +221,22 @@
sethi.p #0xe4e4,gr9 ; second syscall arg [newsp]
setlo #0xe4e4,gr9
setlos.p #0,gr10 ; third syscall arg [parent_tidptr]
-diff -NurpP --minimal linux-2.6.31/arch/h8300/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/h8300/Kconfig
---- linux-2.6.31/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/h8300/Kconfig 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/frv/mm/fault.c linux-2.6.31.2-vs2.3.0.36.15/arch/frv/mm/fault.c
+--- linux-2.6.31.2/arch/frv/mm/fault.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/frv/mm/fault.c 2009-09-29 17:25:48.000000000 +0200
+@@ -257,7 +257,8 @@ asmlinkage void do_page_fault(int datamm
+ */
+ out_of_memory:
+ up_read(&mm->mmap_sem);
+- printk("VM: killing process %s\n", current->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ current->comm, task_pid_nr(current), current->xid);
+ if (user_mode(__frame))
+ do_group_exit(SIGKILL);
+ goto no_context;
+diff -NurpP --minimal linux-2.6.31.2/arch/h8300/Kconfig linux-2.6.31.2-vs2.3.0.36.15/arch/h8300/Kconfig
+--- linux-2.6.31.2/arch/h8300/Kconfig 2009-03-24 14:18:24.000000000 +0100
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/h8300/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -226,6 +226,8 @@ source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
@@ -207,9 +246,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.31/arch/ia64/ia32/ia32_entry.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/ia32/ia32_entry.S
---- linux-2.6.31/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/ia32/ia32_entry.S 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/ia32/ia32_entry.S linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/ia32/ia32_entry.S
+--- linux-2.6.31.2/arch/ia64/ia32/ia32_entry.S 2009-06-11 17:11:57.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/ia32/ia32_entry.S 2009-09-10 16:11:43.000000000 +0200
@@ -451,7 +451,7 @@ ia32_syscall_table:
data8 sys_tgkill /* 270 */
data8 compat_sys_utimes
@@ -219,9 +258,9 @@
data8 sys_ni_syscall
data8 sys_ni_syscall /* 275 */
data8 sys_ni_syscall
-diff -NurpP --minimal linux-2.6.31/arch/ia64/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/Kconfig
---- linux-2.6.31/arch/ia64/Kconfig 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/Kconfig 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/Kconfig linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/Kconfig
+--- linux-2.6.31.2/arch/ia64/Kconfig 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -676,6 +676,8 @@ source "fs/Kconfig"
source "arch/ia64/Kconfig.debug"
@@ -231,9 +270,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/entry.S linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/entry.S
---- linux-2.6.31/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/entry.S 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/kernel/entry.S linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/entry.S
+--- linux-2.6.31.2/arch/ia64/kernel/entry.S 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/entry.S 2009-09-10 16:11:43.000000000 +0200
@@ -1753,7 +1753,7 @@ sys_call_table:
data8 sys_mq_notify
data8 sys_mq_getsetattr
@@ -243,9 +282,9 @@
data8 sys_waitid // 1270
data8 sys_add_key
data8 sys_request_key
-diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/perfmon.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/perfmon.c
---- linux-2.6.31/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/perfmon.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/kernel/perfmon.c linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/perfmon.c
+--- linux-2.6.31.2/arch/ia64/kernel/perfmon.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/perfmon.c 2009-09-10 16:11:43.000000000 +0200
@@ -41,6 +41,7 @@
#include <linux/rcupdate.h>
#include <linux/completion.h>
@@ -263,9 +302,9 @@
vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file,
vma_pages(vma));
up_write(&task->mm->mmap_sem);
-diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/process.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/process.c
---- linux-2.6.31/arch/ia64/kernel/process.c 2009-06-11 17:11:57.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/process.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/kernel/process.c linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/process.c
+--- linux-2.6.31.2/arch/ia64/kernel/process.c 2009-06-11 17:11:57.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/process.c 2009-09-10 16:11:43.000000000 +0200
@@ -110,8 +110,8 @@ show_regs (struct pt_regs *regs)
unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
@@ -277,9 +316,9 @@
printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n",
regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
init_utsname()->release);
-diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/ptrace.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/ptrace.c
---- linux-2.6.31/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/kernel/ptrace.c linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/ptrace.c
+--- linux-2.6.31.2/arch/ia64/kernel/ptrace.c 2009-09-10 15:25:22.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/ptrace.c 2009-09-10 16:11:43.000000000 +0200
@@ -22,6 +22,7 @@
#include <linux/regset.h>
#include <linux/elf.h>
@@ -288,9 +327,9 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.31/arch/ia64/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/traps.c
---- linux-2.6.31/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/kernel/traps.c linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/traps.c
+--- linux-2.6.31.2/arch/ia64/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re
put_cpu();
@@ -315,9 +354,9 @@
}
}
}
-diff -NurpP --minimal linux-2.6.31/arch/ia64/mm/fault.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/mm/fault.c
---- linux-2.6.31/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/ia64/mm/fault.c 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/ia64/mm/fault.c linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/mm/fault.c
+--- linux-2.6.31.2/arch/ia64/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/ia64/mm/fault.c 2009-09-29 17:26:21.000000000 +0200
@@ -10,6 +10,7 @@
#include <linux/interrupt.h>
#include <linux/kprobes.h>
@@ -326,9 +365,19 @@
#include <asm/pgtable.h>
#include <asm/processor.h>
-diff -NurpP --minimal linux-2.6.31/arch/m32r/kernel/traps.c linux-2.6.31-vs2.3.0.36.14-pre8/arch/m32r/kernel/traps.c
---- linux-2.6.31/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m32r/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
+@@ -281,7 +282,8 @@ ia64_do_page_fault (unsigned long addres
+ down_read(&mm->mmap_sem);
+ goto survive;
+ }
+- printk(KERN_CRIT "VM: killing process %s\n", current->comm);
++ printk(KERN_CRIT "VM: killing process %s(%d:#%u)\n",
++ current->comm, task_pid_nr(current), current->xid);
+ if (user_mode(regs))
+ do_group_exit(SIGKILL);
+ goto no_context;
+diff -NurpP --minimal linux-2.6.31.2/arch/m32r/kernel/traps.c linux-2.6.31.2-vs2.3.0.36.15/arch/m32r/kernel/traps.c
+--- linux-2.6.31.2/arch/m32r/kernel/traps.c 2008-12-25 00:26:37.000000000 +0100
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/m32r/kernel/traps.c 2009-09-10 16:11:43.000000000 +0200
@@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
} else {
printk("SPI: %08lx\n", sp);
@@ -341,9 +390,22 @@
/*
* When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-2.6.31/arch/m68k/Kconfig linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/Kconfig
---- linux-2.6.31/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
-+++ linux-2.6.31-vs2.3.0.36.14-pre8/arch/m68k/Kconfig 2009-09-10 16:11:43.000000000 +0200
+diff -NurpP --minimal linux-2.6.31.2/arch/m32r/mm/fault.c linux-2.6.31.2-vs2.3.0.36.15/arch/m32r/mm/fault.c
+--- linux-2.6.31.2/arch/m32r/mm/fault.c 2009-09-10 15:25:23.000000000 +0200
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/m32r/mm/fault.c 2009-09-29 17:26:48.000000000 +0200
+@@ -276,7 +276,8 @@ out_of_memory:
+ down_read(&mm->mmap_sem);
+ goto survive;
+ }
+- printk("VM: killing process %s\n", tsk->comm);
++ printk("VM: killing process %s(%d:#%u)\n",
++ tsk->comm, task_pid_nr(tsk), tsk->xid);
+ if (error_code & ACE_USERMODE)
+ do_group_exit(SIGKILL);
+ goto no_context;
+diff -NurpP --minimal linux-2.6.31.2/arch/m68k/Kconfig linux-2.6.31.2-vs2.3.0.36.15/arch/m68k/Kconfig
+--- linux-2.6.31.2/arch/m68k/Kconfig 2009-03-24 14:18:26.000000000 +0100
++++ linux-2.6.31.2-vs2.3.0.36.15/arch/m68k/Kconfig 2009-09-10 16:11:43.000000000 +0200
@@ -616,6 +616,8 @@ source "fs/Kconfig"
source "arch/m68k/Kconfig.debug"
@@ -353,9 +415,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-grsec_full.patch?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-fixes.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver.config?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.712&r2=1.713&f=u
More information about the pld-cvs-commit
mailing list