SOURCES (Titanium): linux-2.6-grsec-vs-minimal.patch - more 2.6.25...

[hawk]

Author: hawk                         Date: Fri Apr 25 18:44:54 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- more 2.6.25 fixes

---- Files affected:
SOURCES:
   linux-2.6-grsec-vs-minimal.patch (1.1.2.8.2.6 -> 1.1.2.8.2.7) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsec-vs-minimal.patch
diff -u SOURCES/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.6 SOURCES/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.7
--- SOURCES/linux-2.6-grsec-vs-minimal.patch:1.1.2.8.2.6	Fri Apr 25 19:28:36 2008
+++ SOURCES/linux-2.6-grsec-vs-minimal.patch	Fri Apr 25 20:44:48 2008
@@ -146,17 +146,18 @@
 diff -urNp linux-2.6.25.orig/fs/proc/array.c linux-2.6.25/fs/proc/array.c
 --- linux-2.6.25.orig/fs/proc/array.c	2008-04-25 15:09:12.000000000 +0200
 +++ linux-2.6.25/fs/proc/array.c	2008-04-25 15:10:25.000000000 +0200
-@@ -637,3 +637,14 @@ int proc_pid_statm(struct seq_file *m, s
+@@ -637,3 +637,15 @@ int proc_pid_statm(struct seq_file *m, s
  
  	return 0;
  }
 +
 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
-+int proc_pid_ipaddr(struct task_struct *task, char * buffer)
++int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns,
++			struct pid *pid, struct task_struct *task)
 +{
 +	int len;
 +
-+	len = sprintf(buffer, "%u.%u.%u.%u\n", NIPQUAD(task->signal->curr_ip));
++	len = seq_printf(m, "%u.%u.%u.%u\n", NIPQUAD(task->signal->curr_ip));
 +	return len;
 +}
 +#endif
@@ -1117,7 +1118,7 @@
  #endif
  	ONE("nsproxy",	S_IRUGO, pid_nsproxy),
 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
-+	INF("ipaddr",     S_IRUSR, pid_ipaddr),
++	INF("ipaddr",	S_IRUSR, pid_ipaddr),
 +#endif
  };
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec-vs-minimal.patch?r1=1.1.2.8.2.6&r2=1.1.2.8.2.7&f=u