[Xen-changelog] [xen-3.1-testing] ebtables: don't compute gap until we know we have an ebt_entry

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1202135546 0
# Node ID 6741bbc08b256a162eec93c0ed3d1c2fdfced103
# Parent  41cf298709339f07f60f315f0e4f6fbe09027237
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@xxxxxxxxxx>
linux-2.6.18-xen changeset:   405:369b676a32439c947a604323b5b3db6007ffedd2
linux-2.6.18-xen date:        Mon Feb 04 14:29:03 2008 +0000
---
 patches/linux-2.6.18.8/linux-2.6.18-xen-405-369b676a3243 |   26 +++++++++++++++
 patches/linux-2.6.18.8/series                            |    1 
 2 files changed, 27 insertions(+)

diff -r 41cf29870933 -r 6741bbc08b25 
patches/linux-2.6.18.8/linux-2.6.18-xen-405-369b676a3243
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/linux-2.6.18.8/linux-2.6.18-xen-405-369b676a3243  Mon Feb 04 
14:32:26 2008 +0000
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Keir Fraser <keir.fraser@xxxxxxxxxx>
+# 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@xxxxxxxxxx>
+
+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 -r 41cf29870933 -r 6741bbc08b25 patches/linux-2.6.18.8/series
--- a/patches/linux-2.6.18.8/series     Mon Feb 04 14:24:57 2008 +0000
+++ b/patches/linux-2.6.18.8/series     Mon Feb 04 14:32:26 2008 +0000
@@ -23,3 +23,4 @@ git-5ee7737379b1d7f0c977c0f1661fbaf01a8d
 git-5ee7737379b1d7f0c977c0f1661fbaf01a8d4721.patch
 linux-2.6.18-xen-375-748cd890ea7f
 linux-2.6.18-xen-376-353802ec1caf
+linux-2.6.18-xen-405-369b676a3243

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog