r913 - in trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian: . patches

Simon Horman horms@haydn.debian.org
Tue, 20 Jul 2004 02:04:18 -0600


Author: horms
Date: 2004-07-20 02:04:04 -0600 (Tue, 20 Jul 2004)
New Revision: 913

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list
Log:
Fix stack allocation in crypt(). Patch by Herbert Xu (closes: #257120)
. crypto/cipher.c



Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-07-20 07:54:47 UTC (rev 912)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-07-20 08:04:04 UTC (rev 913)
@@ -1,3 +1,11 @@
+kernel-source-2.4.26 (2.4.26-4) UNRELEASED; urgency=low
+
+  * Fix stack allocation in crypt(). Patch by Herbert Xu
+    (closes: #257120)
+    . crypto/cipher.c
+
+ -- Simon Horman <horms@debian.org>  Tue, 20 Jul 2004 16:58:26 +0900
+
 kernel-source-2.4.26 (2.4.26-3) unstable; urgency=low
 
   * Changed Maintainer to kernel team.

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list	2004-07-20 07:54:47 UTC (rev 912)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/list	2004-07-20 08:04:04 UTC (rev 913)
@@ -4,3 +4,4 @@
 patch-2.4.26-1		2.4.26		2.4.26-1
 patch-2.4.26-2		2.4.26-1	2.4.26-2
 patch-2.4.26-3		2.4.26-2	2.4.26-3
+patch-2.4.26-4		2.4.26-3	2.4.26-4

Added: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4	2004-07-20 07:54:47 UTC (rev 912)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-4	2004-07-20 08:04:04 UTC (rev 913)
@@ -0,0 +1,14 @@
+===== crypto/cipher.c 1.18 vs edited =====
+--- 1.18/crypto/cipher.c	2004-05-27 06:25:36 +10:00
++++ edited/crypto/cipher.c	2004-07-15 21:40:53 +10:00
+@@ -52,8 +52,8 @@
+ {
+ 	struct scatter_walk walk_in, walk_out;
+ 	const unsigned int bsize = crypto_tfm_alg_blocksize(tfm);
+-	u8 tmp_src[nbytes > src->length ? bsize : 0];
+-	u8 tmp_dst[nbytes > dst->length ? bsize : 0];
++	u8 tmp_src[bsize];
++	u8 tmp_dst[bsize];
+ 
+ 	if (!nbytes)
+ 		return 0;