ebtables: don't compute gap until we know we have an ebt_entry

Original upstream Linux patch by Chuck Ebbert.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
linux-2.6.18-xen changeset:   405:369b676a32439c947a604323b5b3db6007ffedd2
linux-2.6.18-xen date:        Mon Feb 04 14:29:03 2008 +0000

diff --git a/patches/linux-2.6.18.8/linux-2.6.18-xen-405-369b676a3243 b/patches/linux-2.6.18.8/linux-2.6.18-xen-405-369b676a3243
new file mode 100644 (file)
index 0000000..dca8a85
--- /dev/null
+++ b/patches/linux-2.6.18.8/linux-2.6.18-xen-405-369b676a3243
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Keir Fraser <keir.fraser@citrix.com>
+# Date 1202135343 0
+# Node ID 369b676a32439c947a604323b5b3db6007ffedd2
+# Parent  7f0c06696fecc93ac06517010e551a8f9d67e30d
+ebtables: don't compute gap until we know we have an ebt_entry
+Original upstream Linux patch by Chuck Ebbert.
+Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
+
+diff -r 7f0c06696fec -r 369b676a3243 net/bridge/netfilter/ebtables.c
+--- a/net/bridge/netfilter/ebtables.c  Fri Feb 01 11:34:02 2008 +0000
++++ b/net/bridge/netfilter/ebtables.c  Mon Feb 04 14:29:03 2008 +0000
+@@ -597,7 +597,7 @@ ebt_check_entry(struct ebt_entry *e, str
+       struct ebt_entry_target *t;
+       struct ebt_target *target;
+       unsigned int i, j, hook = 0, hookmask = 0;
+-      size_t gap = e->next_offset - e->target_offset;
++      size_t gap;
+       int ret;
+ 
+       /* don't mess with the struct ebt_entries */
+@@ -647,6 +647,7 @@ ebt_check_entry(struct ebt_entry *e, str
+       if (ret != 0)
+               goto cleanup_watchers;
+       t = (struct ebt_entry_target *)(((char *)e) + e->target_offset);
++      gap = e->next_offset - e->target_offset;
+       target = find_target_lock(t->u.name, &ret, &ebt_mutex);
+       if (!target)
+               goto cleanup_watchers;

diff --git a/patches/linux-2.6.18.8/series b/patches/linux-2.6.18.8/series
index 54124a5ed437ab15ae73fba51335db5ebcf3ccdb..96deeb89d6f2af411cb54faa202e089d6b151eb9 100644 (file)
--- a/patches/linux-2.6.18.8/series
+++ b/patches/linux-2.6.18.8/series
@@ -23,3 +23,4 @@ allow-i386-crash-kernels-to-handle-x86_64-dumps-fix.patch
 git-5ee7737379b1d7f0c977c0f1661fbaf01a8d4721.patch
 linux-2.6.18-xen-375-748cd890ea7f
 linux-2.6.18-xen-376-353802ec1caf
+linux-2.6.18-xen-405-369b676a3243