r2043 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2004-12-23 22:19:17 -0700 (Thu, 23 Dec 2004)
New Revision: 2043

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/kernel_read-result-validation.dpatch
Log:
I hate you, milkman dan.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/kernel_read-result-validation.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/kernel_read-result-validation.dpatch	2004-12-24 05:06:14 UTC (rev 2042)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/kernel_read-result-validation.dpatch	2004-12-24 05:19:17 UTC (rev 2043)
@@ -115,7 +115,7 @@
 @@ -1426,8 +1426,11 @@
  		goto out;
  
- 	retval = prepare_binprm(bprm);
+ 	retval = prepare_binprm(&bprm);
 -	if (retval < 0)
 +	if (retval != BINPRM_BUF_SIZE) {
 +		if (retval >= 0)
@@ -123,7 +123,7 @@
  		goto out;
 +	}
  
- 	retval = copy_strings_kernel(1, &bprm->filename, bprm);
+ 	retval = copy_strings_kernel(1, &bprm->filename, &bprm);
  	if (retval < 0)
 
 
@@ -145,7 +145,7 @@
 @@ -1139,8 +1142,11 @@
  		goto out;
  
- 	retval = prepare_binprm(bprm);
+ 	retval = prepare_binprm(&bprm);
 -	if (retval < 0)
 +	if (retval != BINPRM_BUF_SIZE) {
 +		if (retval >= 0)
@@ -153,7 +153,7 @@
  		goto out;
 +	}
  
- 	retval = copy_strings_kernel(1, &bprm->filename, bprm);
+ 	retval = copy_strings_kernel(1, &bprm->filename, &bprm);
  	if (retval < 0)