projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| d48ecf2a JR |
1 | --- linux/kernel/sys.c~ Sun Feb 3 20:21:09 2002 |
| 2 | +++ linux/kernel/sys.c Sun Feb 3 20:21:40 2002 | |
| 3 | @@ -230,14 +230,14 @@ | |
| 4 | error = 0; | |
| 5 | #ifdef CONFIG_GRKERNSEC_CHROOT_NICE | |
| 6 | if(grsec_enable_chroot_nice && (!have_same_root(p,current) | |
| 7 | - || (have_same_root(p,current) && (niceval < p->nice) && proc_is_chrooted(current)))) { | |
| 48381c96 | 8 | + || (have_same_root(p,current) && (niceval < task_nice(p)) && proc_is_chrooted(current)))) { |
| d48ecf2a JR |
9 | security_alert("attempted priority change of " |
| 10 | "process (%.16s:%d) by " DEFAULTSECMSG, | |
| 11 | "attempted priority changes",p->comm,p->pid,DEFAULTSECARGS); | |
| 12 | return -ESRCH; /* be stealthy */ | |
| 13 | } | |
| 14 | #endif | |
| 15 | - if (niceval < p->nice && !capable(CAP_SYS_NICE)) | |
| 48381c96 | 16 | + if (niceval < task_nice(p) && !capable(CAP_SYS_NICE)) |
| d48ecf2a JR |
17 | error = -EACCES; |
| 18 | else | |
| 19 | set_user_nice(p, niceval); | |
| 48381c96 JR |
20 | --- linux/kernel/sched.c~ Mon Feb 4 15:07:57 2002 |
| 21 | +++ linux/kernel/sched.c Mon Feb 4 15:10:58 2002 | |
| 22 | @@ -19,6 +19,7 @@ | |
| 23 | #include <linux/smp_lock.h> | |
| 24 | #include <linux/interrupt.h> | |
| 25 | #include <asm/mmu_context.h> | |
| 26 | +#include <linux/kernel_stat.h> | |
| 27 | #ifdef CONFIG_GRKERNSEC_CHROOT_NICE | |
| 28 | #include <linux/grsecurity.h> | |
| 29 | #endif | |
| f2550ba7 | 30 | diff -urN linux/kernel/printk.c linux/kernel/printk.c |
| 31 | --- linux/kernel/printk.c Mon Feb 25 14:38:13 2002 | |
| 32 | +++ linux/kernel/printk.c Mon Feb 25 16:09:02 2002 | |
| 33 | @@ -26,6 +26,7 @@ | |
| 34 | #include <linux/module.h> | |
| 35 | #include <linux/interrupt.h> /* For in_interrupt() */ | |
| 36 | #include <linux/config.h> | |
| 37 | +#include <linux/delay.h> | |
| 20e476d0 | 38 | #ifdef CONFIG_GRKERNSEC_DMESG |
| 39 | #include <linux/grsecurity.h> | |
| 40 | #endif |