SOURCES (LINUX_2_6): grsecurity-2.1.9-2.6.19.1.patch - cosmetics

[mguevara]

Author: mguevara                     Date: Sat Dec 16 01:14:13 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- cosmetics 

---- Files affected:
SOURCES:
   grsecurity-2.1.9-2.6.19.1.patch (1.1.2.3 -> 1.1.2.4) 

---- Diffs:

================================================================
Index: SOURCES/grsecurity-2.1.9-2.6.19.1.patch
diff -u SOURCES/grsecurity-2.1.9-2.6.19.1.patch:1.1.2.3 SOURCES/grsecurity-2.1.9-2.6.19.1.patch:1.1.2.4
--- SOURCES/grsecurity-2.1.9-2.6.19.1.patch:1.1.2.3	Sat Dec 16 01:29:04 2006
+++ SOURCES/grsecurity-2.1.9-2.6.19.1.patch	Sat Dec 16 02:14:07 2006
@@ -9664,7 +9664,6 @@
 --- linux-2.6.19.1/fs/binfmt_elf.c	2006-11-29 16:57:37.000000000 -0500
 +++ linux-2.6.19.1/fs/binfmt_elf.c	2006-12-03 15:16:12.000000000 -0500
 @@ -39,10 +39,16 @@
- #include <linux/syscalls.h>
  #include <linux/random.h>
  #include <linux/elf.h>
  #include <linux/vs_memory.h>
@@ -10534,7 +10533,6 @@
 --- linux-2.6.19.1/fs/exec.c	2006-12-10 21:40:26.000000000 -0500
 +++ linux-2.6.19.1/fs/exec.c	2006-12-10 21:40:16.000000000 -0500
 @@ -49,6 +49,8 @@
- #include <linux/tsacct_kern.h>
  #include <linux/cn_proc.h>
  #include <linux/audit.h>
  #include <linux/vs_memory.h>
@@ -10625,7 +10623,7 @@
  
  	down_write(&mm->mmap_sem);
  	{
-@@ -430,13 +469,50 @@ int setup_arg_pages(struct linux_binprm 
+@@ -430,10 +453,23 @@ int setup_arg_pages(struct linux_binprm 
  		else
  			mpnt->vm_flags = VM_STACK_FLAGS;
  		mpnt->vm_flags |= mm->def_flags;
@@ -10650,6 +10648,9 @@
  			return ret;
  		}
 		vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
+@@ -452,6 +482,30 @@ int setup_arg_pages(struct linux_binprm
+ 		}
+ 		vx_vmpages_sub(mm, mm->total_vm - vma_pages(mpnt));
  		mm->stack_vm = mm->total_vm;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -10963,7 +10964,6 @@
 --- linux-2.6.19.1/fs/fcntl.c	2006-11-29 16:57:37.000000000 -0500
 +++ linux-2.6.19.1/fs/fcntl.c	2006-12-03 15:16:14.000000000 -0500
 @@ -18,6 +18,7 @@
- #include <linux/ptrace.h>
  #include <linux/signal.h>
  #include <linux/rcupdate.h>
  #include <linux/vs_limit.h>
@@ -11022,7 +11022,6 @@
 --- linux-2.6.19.1/fs/namei.c	2006-11-29 16:57:37.000000000 -0500
 +++ linux-2.6.19.1/fs/namei.c	2006-12-03 15:16:15.000000000 -0500
 @@ -32,6 +32,7 @@
- #include <linux/vserver/inode.h>
  #include <linux/vs_base.h>
  #include <linux/vs_tag.h>
  #include <linux/vs_cowbl.h>
@@ -11652,7 +11651,6 @@
 
  #include "internal.h"
  
- /* NOTE:
 @@ -194,7 +195,7 @@ static int proc_root_link(struct inode *
  	(task->parent == current && \
  	(task->ptrace & PT_PTRACED) && \
@@ -21466,7 +21464,7 @@
 +#ifdef CONFIG_PAX_SEGMEXEC
 +#define ELF_ET_DYN_BASE	((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : (TASK_UNMAPPED_BASE) * 2)
 +#else
- #define ELF_ET_DYN_BASE	((TASK_UNMAPPED_BASE) * 2)
+ #define ELF_ET_DYN_BASE		((TASK_UNMAPPED_BASE) * 2)
 +#endif
 +
 +#ifdef CONFIG_PAX_ASLR
@@ -24672,7 +24670,6 @@
  		goto out;
  #endif
 @@ -195,10 +197,10 @@ dev_t name_to_dev_t(char *name)
- 	res = try_name(s, part);
  done:
  #ifdef CONFIG_SYSFS
  	if (mount_result >= 0)
@@ -24920,7 +24917,6 @@
 --- linux-2.6.19.1/ipc/msg.c	2006-11-29 16:57:37.000000000 -0500
 +++ linux-2.6.19.1/ipc/msg.c	2006-12-03 15:16:26.000000000 -0500
 @@ -36,6 +36,7 @@
- #include <linux/seq_file.h>
  #include <linux/mutex.h>
  #include <linux/nsproxy.h>
  #include <linux/vs_base.h>
@@ -24949,7 +24945,6 @@
 --- linux-2.6.19.1/ipc/sem.c	2006-11-29 16:57:37.000000000 -0500
 +++ linux-2.6.19.1/ipc/sem.c	2006-12-03 15:16:26.000000000 -0500
 @@ -83,6 +83,7 @@
- #include <linux/mutex.h>
  #include <linux/nsproxy.h>
  #include <linux/vs_base.h>
  #include <linux/vs_limit.h>
@@ -28615,9 +28610,9 @@
 --- linux-2.6.19.1/net/unix/af_unix.c	2006-11-29 16:57:37.000000000 -0500
 +++ linux-2.6.19.1/net/unix/af_unix.c	2006-12-03 15:16:30.000000000 -0500
 @@ -116,6 +116,7 @@
- #include <linux/mount.h>
- #include <net/checksum.h>
  #include <linux/security.h>
+ #include <linux/vs_context.h>
+ #include <linux/vs_limit.h>
 +#include <linux/grsecurity.h>
  
  int sysctl_unix_max_dgram_qlen __read_mostly = 10;
@@ -28658,7 +28653,7 @@
 +			goto out_mknod_dput;
 +		}
 +
- 		err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0);
+ 		err = vfs_mknod(nd.dentry->d_inode, dentry, mode, 0, NULL);
  		if (err)
  			goto out_mknod_dput;
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/grsecurity-2.1.9-2.6.19.1.patch?r1=1.1.2.3&r2=1.1.2.4&f=u