- patch to fix 64-bit pointer arithmetic bug in the ext3 extended

  attributes code.

diff --git a/lustre/kernel_patches/patches/ext3-xattr-ptr-arith-fix.patch b/lustre/kernel_patches/patches/ext3-xattr-ptr-arith-fix.patch
new file mode 100644 (file)
index 0000000..05fcf61
--- /dev/null
+++ b/lustre/kernel_patches/patches/ext3-xattr-ptr-arith-fix.patch
@@ -0,0 +1,18 @@
+Index: linux-2.4.20/fs/ext3/xattr.c
+===================================================================
+--- linux-2.4.20.orig/fs/ext3/xattr.c  2003-11-13 17:14:52.000000000 +0300
++++ linux-2.4.20/fs/ext3/xattr.c       2003-11-21 16:43:48.000000000 +0300
+@@ -1293,9 +1293,10 @@
+                               goto cleanup;
+                       memcpy(header, HDR(bh), bh->b_size);
+                       header->h_refcount = cpu_to_le32(1);
+-                      offset = (char *)header - bh->b_data;
+-                      here = ENTRY((char *)here + offset);
+-                      last = ENTRY((char *)last + offset);
++                      offset = (char *)here - bh->b_data;
++                      here = ENTRY((char *)header + offset);
++                      offset = (char *)last - bh->b_data;
++                      last = ENTRY((char *)header + offset);
+               }
+       } else {
+               /* Allocate a buffer where we construct the new block. */

diff --git a/lustre/kernel_patches/series/hp-pnnl-2.4.20 b/lustre/kernel_patches/series/hp-pnnl-2.4.20
index c57fa8e..5b6876f 100644 (file)
--- a/lustre/kernel_patches/series/hp-pnnl-2.4.20
+++ b/lustre/kernel_patches/series/hp-pnnl-2.4.20
@@ -34,3 +34,5 @@ nfs_export_kernel-2.4.20-hp.patch
 ext3-ea-in-inode-2.4.20.patch
 listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
+gfp_memalloc-2.4.22.patch
+ext3-xattr-ptr-arith-fix.patch

diff --git a/lustre/kernel_patches/series/rh-2.4.20 b/lustre/kernel_patches/series/rh-2.4.20
index 792a123..46052d9 100644 (file)
--- a/lustre/kernel_patches/series/rh-2.4.20
+++ b/lustre/kernel_patches/series/rh-2.4.20
@@ -38,4 +38,6 @@ ext3-ea-in-inode-2.4.20.patch
 listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
 netconsole-2.4.20-rh.patch
-kernel_text_address-2.4.20-rh.patch 
+kernel_text_address-2.4.20-rh.patch
+gfp_memalloc-2.4.20-rh.patch
+ext3-xattr-ptr-arith-fix.patch

diff --git a/lustre/kernel_patches/series/rh-2.4.22 b/lustre/kernel_patches/series/rh-2.4.22
index 6fc297c..a3bd2b9 100644 (file)
--- a/lustre/kernel_patches/series/rh-2.4.22
+++ b/lustre/kernel_patches/series/rh-2.4.22
@@ -25,3 +25,4 @@ ext3-ea-in-inode-2.4.22-rh.patch
 listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
 gfp_memalloc-2.4.22.patch
+ext3-xattr-ptr-arith-fix.patch

diff --git a/lustre/kernel_patches/series/suse-2.4.21 b/lustre/kernel_patches/series/suse-2.4.21
index e547319..b3c5d0d 100644 (file)
--- a/lustre/kernel_patches/series/suse-2.4.21
+++ b/lustre/kernel_patches/series/suse-2.4.21
@@ -27,3 +27,4 @@ ext3-ea-in-inode-2.4.20.patch
 listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
 gfp_memalloc-2.4.22.patch
+ext3-xattr-ptr-arith-fix.patch

diff --git a/lustre/kernel_patches/series/vanilla-2.4.19-pre1 b/lustre/kernel_patches/series/vanilla-2.4.19-pre1
index db64c54..b6ded90 100644 (file)
--- a/lustre/kernel_patches/series/vanilla-2.4.19-pre1
+++ b/lustre/kernel_patches/series/vanilla-2.4.19-pre1
@@ -41,3 +41,5 @@ jbd-2.4.19-pre1-jcberr.patch
 seq-private-2.4.19-pre1.patch 
 kdev-2.4.19-pre1.patch 
 resched-2.4.19-pre1.patch
+ext3-xattr-ptr-arith-fix.patch
+gfp_memalloc-2.4.22.patch

diff --git a/lustre/kernel_patches/series/vanilla-2.4.22 b/lustre/kernel_patches/series/vanilla-2.4.22
index 36895cf..d3b7123 100644 (file)
--- a/lustre/kernel_patches/series/vanilla-2.4.22
+++ b/lustre/kernel_patches/series/vanilla-2.4.22
@@ -28,3 +28,4 @@ listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
 kernel_text_address-2.4.22-vanilla.patch
 gfp_memalloc-2.4.22.patch
+ext3-xattr-ptr-arith-fix.patch