packages (Titanium): kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch -...

[hawk]

Author: hawk                         Date: Fri May 20 09:14:25 2011 GMT
Module: packages                      Tag: Titanium
---- Log message:
- updated for vserver patched kernel

---- Files affected:
packages/kernel-bare-vserver:
   linux-2.6-grsec-vs-minimal.patch (1.1.2.8.2.17 -> 1.1.2.8.2.18) 

---- Diffs:

================================================================
Index: packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch
diff -u packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.17 packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.18
--- packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.17	Sat Apr 30 11:59:10 2011
+++ packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch	Fri May 20 11:14:20 2011
@@ -932,9 +932,9 @@
  		} else {
  			inode->i_uid = 0;
 @@ -2836,6 +2945,9 @@ static const struct pid_entry tgid_base_
- #ifdef CONFIG_TASK_IO_ACCOUNTING
  	INF("io",	S_IRUGO, proc_tgid_io_accounting),
  #endif
+ 	ONE("nsproxy",	S_IRUGO, proc_pid_nsproxy),
 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
 +	INF("ipaddr",	  S_IRUSR, proc_pid_ipaddr),
 +#endif
@@ -968,7 +968,7 @@
  	struct tgid_iter iter;
  	struct pid_namespace *ns;
  
-@@ -3091,8 +3219,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3091,10 +3219,29 @@ int proc_pid_readdir(struct file * filp,
  	for (iter = next_tgid(ns, iter);
  	     iter.task;
  	     iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -992,6 +992,8 @@
 +	rcu_read_unlock();
 +#endif
  		filp->f_pos = iter.tgid + TGID_OFFSET;
+ 		if (!vx_proc_task_visible(iter.task))
+ 			continue;
 -		if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
 +		if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
  			put_task_struct(iter.task);
@@ -1046,9 +1048,9 @@
 --- linux-2.6.38.4/fs/proc/internal.h	2011-03-14 21:20:32.000000000 -0400
 +++ linux-2.6.38.4/fs/proc/internal.h	2011-04-17 15:57:32.000000000 -0400
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
+ extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
  				struct pid *pid, struct task_struct *task);
- extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
- 				struct pid *pid, struct task_struct *task);
+ 
 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
 +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
 +#endif
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-bare-vserver/linux-2.6-grsec-vs-minimal.patch?r1=1.1.2.8.2.17&r2=1.1.2.8.2.18&f=u