rpms/kernel/devel linux-2.6-sha_alignment.patch, NONE, 1.1 kernel-2.6.spec, 1.2751, 1.2752

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14218

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-sha_alignment.patch 
Log Message:
Fix sha1 alignment problem on ia64.

linux-2.6-sha_alignment.patch:
 sha1.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE linux-2.6-sha_alignment.patch ---
Patch to fix unaligned access during module loads.

Tested by Doug (dchapman at redhat.com) on HP ia64 boxes, and by me on SGI ia64
box.  Additionally tested by me on x86_64.

Addresses and resolves BZ 210013.

Signed-off-by: Prarit Bhargava <prarit at redhat.com>
Signed-off-by: Doug Chapman <dchapman at redhat.com>


--- linux-2.6.17.ia64/lib/sha1.c.orig	2006-09-19 17:07:59.000000000 -0400
+++ linux-2.6.17.ia64/lib/sha1.c	2006-09-19 17:07:48.000000000 -0400
@@ -3,6 +3,7 @@
  * Peter Gutmann, and placed in the public domain.
  */
 
+#include <asm/unaligned.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/cryptohash.h>
@@ -41,7 +42,7 @@
 	__u32 a, b, c, d, e, t, i;
 
 	for (i = 0; i < 16; i++)
-		W[i] = be32_to_cpu(((const __be32 *)in)[i]);
+		W[i] = be32_to_cpu(get_unaligned((const __be32 *)in+i));
 
 	for (i = 0; i < 64; i++)
 		W[i+16] = rol32(W[i+13] ^ W[i+8] ^ W[i+2] ^ W[i], 1);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2751
retrieving revision 1.2752
diff -u -r1.2751 -r1.2752
--- kernel-2.6.spec	10 Oct 2006 04:12:35 -0000	1.2751
+++ kernel-2.6.spec	10 Oct 2006 04:18:41 -0000	1.2752
@@ -477,6 +477,7 @@
 
 # Misc bits.
 Patch1600: linux-2.6-module_version.patch
+Patch1601: linux-2.6-sha_alignment.patch
 Patch1610: linux-2.6-input-kill-stupid-messages.patch
 Patch1620: linux-2.6-serial-tickle-nmi.patch
 Patch1630: linux-2.6-mm-suspend-improvements.patch
@@ -1086,6 +1087,8 @@
 # Misc fixes
 # Add missing MODULE_VERSION tags to some modules.
 %patch1600 -p1
+# Fix SHA1 alignment problem on ia64
+%patch1601 -p1
 # The input layer spews crap no-one cares about.
 %patch1610 -p1
 # Tickle the NMI whilst doing serial writes.
@@ -2002,6 +2005,7 @@
 - Fix some warnings in tux/squashfs due to 64bit nfs inodes.
 - NFS lockdep fix.
 - Fix NFSv3 corruption. (#209420)
+- Fix sha1 alignment problem on ia64.
 
 * Fri Oct  6 2006 Dave Jones <davej at redhat.com>
 - Fix ISCSI oops if connection setup fails.