SOURCES (Titanium): linux-2.6-grsecurity.patch - merged pax fixes from http...

[hawk]

Author: hawk                         Date: Sat Jun  7 13:10:33 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- merged pax fixes from http://www.grsecurity.net/~paxguy1/pax-linux-2.6.25.5-test23.patch

---- Files affected:
SOURCES:
   linux-2.6-grsecurity.patch (1.1.2.15 -> 1.1.2.16) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsecurity.patch
diff -u SOURCES/linux-2.6-grsecurity.patch:1.1.2.15 SOURCES/linux-2.6-grsecurity.patch:1.1.2.16
--- SOURCES/linux-2.6-grsecurity.patch:1.1.2.15	Sat Jun  7 15:04:34 2008
+++ SOURCES/linux-2.6-grsecurity.patch	Sat Jun  7 15:10:27 2008
@@ -29995,7 +29995,7 @@
  	for (call = __initcall_start; call < __initcall_end; call++) {
  		ktime_t t0, t1, delta;
 -		char *msg = NULL;
-+		char *msg1 = NULL, *msg2 = NULL;
++		const char *msg1 = "", *msg2 = "";
  		char msgbuf[40];
  		int result;
  
@@ -30021,13 +30021,12 @@
  			local_irq_enable();
  		}
 -		if (msg) {
-+		if (msgbuf[0] || msg1 || msg2) {
++		if (msgbuf[0] || *msg1 || *msg2) {
  			printk(KERN_WARNING "initcall at 0x%p", *call);
  			print_fn_descriptor_symbol(": %s()",
  					(unsigned long) *call);
 -			printk(": returned with %s\n", msg);
-+			printk(": returned with%s%s%s\n",
-+			       msgbuf[0] ? msgbuf : "", msg1 ? msg1 : "", msg2 ? msg2 : "");
++			printk(": returned with%s%s%s\n", msgbuf, msg1, msg2);
  		}
  	}
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsecurity.patch?r1=1.1.2.15&r2=1.1.2.16&f=u