SOURCES: grsecurity-2.1.9-2.4.33-200608131429.patch - fixes

[qboosh]

Author: qboosh                       Date: Wed Aug 16 14:04:49 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes

---- Files affected:
SOURCES:
   grsecurity-2.1.9-2.4.33-200608131429.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/grsecurity-2.1.9-2.4.33-200608131429.patch
diff -u SOURCES/grsecurity-2.1.9-2.4.33-200608131429.patch:1.2 SOURCES/grsecurity-2.1.9-2.4.33-200608131429.patch:1.3
--- SOURCES/grsecurity-2.1.9-2.4.33-200608131429.patch:1.2	Wed Aug 16 15:04:11 2006
+++ SOURCES/grsecurity-2.1.9-2.4.33-200608131429.patch	Wed Aug 16 16:04:43 2006
@@ -15923,7 +15923,7 @@
 +gr_handle_chroot_setpriority(const struct task_struct *p, const int niceval)
 +{
 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
-+	if (grsec_enable_chroot_nice && (niceval < p->nice)
++	if (grsec_enable_chroot_nice && (niceval < task_nice(p))
 +			&& proc_is_chrooted(current)) {
 +		gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
 +		return -EACCES;
@@ -21069,7 +21069,7 @@
  	unsigned long len, unsigned long prot,
  	unsigned long flag, unsigned long pgoff);
  
-+extern unsigned long __do_mmap_pgoff(struct file *file, unsigned long addr,
++extern unsigned long __do_mmap_pgoff(struct mm_struct *mm, struct file *file, unsigned long addr,
 +	unsigned long len, unsigned long prot,
 +	unsigned long flag, unsigned long pgoff);
 +
@@ -23286,7 +23286,7 @@
  	if ((addr & ~PAGE_MASK) || addr >= TASK_SIZE || len > TASK_SIZE-addr)
  		return -EINVAL;
  
-@@ -964,59 +1189,65 @@ int do_munmap(struct mm_struct *mm, unsi
+@@ -964,65 +1189,69 @@ int do_munmap(struct mm_struct *mm, unsi
  	if (!extra)
  		return -ENOMEM;
  
@@ -23390,6 +23390,12 @@
  	/* Release the extra vma struct if it wasn't used */
  	if (extra)
  		kmem_cache_free(vm_area_cachep, extra);
+ 
+-	free_pgtables(mm, prev, addr, addr+len);
+-
+ 	return 0;
+ }
+ 
 @@ -1031,8 +1262,15 @@ asmlinkage long sys_munmap(unsigned long
  	int ret;
  	struct mm_struct *mm = current->mm;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/grsecurity-2.1.9-2.4.33-200608131429.patch?r1=1.2&r2=1.3&f=u