SOURCES (hawk-LINUX_2_6): linux-2.6-grsec-minimal.patch - updated ...

[hawk]

Author: hawk                         Date: Mon May  7 13:27:30 2007 GMT
Module: SOURCES                       Tag: hawk-LINUX_2_6
---- Log message:
- updated for 2.6.21.1

---- Files affected:
SOURCES:
   linux-2.6-grsec-minimal.patch (1.1.2.20.4.4 -> 1.1.2.20.4.5) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec-minimal.patch
diff -u SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.20.4.4 SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.20.4.5
--- SOURCES/linux-2.6-grsec-minimal.patch:1.1.2.20.4.4	Mon Mar 26 17:53:38 2007
+++ SOURCES/linux-2.6-grsec-minimal.patch	Mon May  7 15:27:25 2007
@@ -192,10 +192,10 @@
 diff -urNp linux-2.6.20.3/fs/proc/proc_misc.c linux-2.6.20.3/fs/proc/proc_misc.c
 --- linux-2.6.20.3/fs/proc/proc_misc.c	2007-03-13 14:27:08.000000000 -0400
 +++ linux-2.6.20.3/fs/proc/proc_misc.c	2007-03-23 08:11:31.000000000 -0400
-@@ -673,6 +673,8 @@ void create_seq_entry(char *name, mode_t
+@@ -667,6 +667,8 @@ void create_seq_entry(char *name, mode_t
+ 
  void __init proc_misc_init(void)
  {
- 	struct proc_dir_entry *entry;
 +	int gr_mode = 0;
 +
  	static struct {
@@ -277,7 +277,7 @@
  	proc_net_stat = proc_mkdir("net/stat", NULL);
  
  #ifdef CONFIG_SYSVIPC
-@@ -89,7 +95,15 @@ void __init proc_root_init(void)
+@@ -78,7 +84,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
  #endif
@@ -290,9 +290,9 @@
 +#else
  	proc_bus = proc_mkdir("bus", NULL);
 +#endif
+ 	proc_sys_init();
  }
  
- static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat
 diff -urNp linux-2.6.20.3/grsecurity/Kconfig linux-2.6.20.3/grsecurity/Kconfig
 --- linux-2.6.20.3/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.6.20.3/grsecurity/Kconfig	2007-03-23 08:11:31.000000000 -0400
@@ -897,10 +897,10 @@
 diff -urNp linux-2.6.20.3/ipc/shm.c linux-2.6.20.3/ipc/shm.c
 --- linux-2.6.20.3/ipc/shm.c	2007-03-13 14:27:08.000000000 -0400
 +++ linux-2.6.20.3/ipc/shm.c	2007-03-23 08:11:31.000000000 -0400
-@@ -37,6 +37,7 @@
- #include <linux/seq_file.h>
+@@ -38,6 +38,7 @@
  #include <linux/mutex.h>
  #include <linux/nsproxy.h>
+ #include <linux/mount.h>
 +#include <linux/grsecurity.h>
  
  #include <asm/uaccess.h>
@@ -933,18 +933,18 @@
  	shp->shm_segsz = size;
  	shp->shm_nattch = 0;
  	shp->id = shm_buildid(ns, id, shp->shm_perm.seq);
-@@ -842,6 +869,11 @@ long do_shmat(int shmid, char __user *sh
- 	file = shp->shm_file;
- 	size = i_size_read(file->f_path.dentry->d_inode);
+@@ -901,6 +916,11 @@ long do_shmat(int shmid, char __user *sh
+ 	path.dentry = dget(shp->shm_file->f_path.dentry);
+ 	path.mnt    = mntget(shp->shm_file->f_path.mnt);
  	shp->shm_nattch++;
 +
 +#ifdef CONFIG_GRKERNSEC
 +	shp->shm_lapid = current->pid;
 +#endif
 +
+ 	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
- 	down_write(&current->mm->mmap_sem);
 @@ -1014,3 +1055,27 @@ static int sysvipc_shm_proc_show(struct 
  			  shp->shm_ctim);
  }
@@ -1137,14 +1137,14 @@
   * Allocate and initialize a new local port bind bucket.
   * The bindhash mutex for snum's hash chain must be held here.
 @@ -338,6 +341,8 @@ ok:
-  		}
-  		spin_unlock(&head->lock);
+ 		}
+ 		spin_unlock(&head->lock);
  
 +		gr_update_task_in_ip_table(current, inet_sk(sk));
 +
-  		if (tw) {
-  			inet_twsk_deschedule(tw, death_row);
-  			inet_twsk_put(tw);
+ 		if (tw) {
+ 			inet_twsk_deschedule(tw, death_row);
+ 			inet_twsk_put(tw);
 diff -urNp linux-2.6.20.3/net/socket.c linux-2.6.20.3/net/socket.c
 --- linux-2.6.20.3/net/socket.c	2007-03-13 14:27:08.000000000 -0400
 +++ linux-2.6.20.3/net/socket.c	2007-03-23 08:11:31.000000000 -0400
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-grsec-minimal.patch?r1=1.1.2.20.4.4&r2=1.1.2.20.4.5&f=u