aboutsummaryrefslogtreecommitdiff
path: root/original
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-04-29 12:29:24 -0700
committerNick Kralevich <nnk@google.com>2013-04-29 12:29:24 -0700
commit01d78f56e3474040ed9897e1fa3600848392f09a (patch)
tree16e4d3be15a6d921d14acd0a07e995f89b118632 /original
parent5f85216f2a5317241b363e464f98f1c3e04992bf (diff)
downloadkernel-headers-01d78f56e3474040ed9897e1fa3600848392f09a.tar.gz
[NETFILTER]: Fix iptables ABI breakage
Pick up Linux kernel patch 2748e5dec7ca8a3804852c7c4171f9156384d15c from 2007 http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=2748e5dec7ca8a3804852c7c4171f9156384d15c [NETFILTER]: Fix iptables ABI breakage on (at least) CRIS With the introduction of x_tables we accidentally broke compatibility by defining IPT_TABLE_MAXNAMELEN to XT_FUNCTION_MAXNAMELEN instead of XT_TABLE_MAXNAMELEN, which is two bytes larger. On most architectures it doesn't really matter since we don't have any tables with names that long in the kernel and the structure layout didn't change because of alignment requirements of following members. On CRIS however (and other architectures that don't align data) this changed the structure layout and thus broke compatibility with old iptables binaries. Changing it back will break compatibility with binaries compiled against recent kernels again, but since the breakage has only been there for three releases this seems like the better choice. Change-Id: Ibb7355f822e4f5f6f3bec9a905433e49a31f3804
Diffstat (limited to 'original')
-rw-r--r--original/linux/netfilter_ipv4/ip_tables.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/original/linux/netfilter_ipv4/ip_tables.h b/original/linux/netfilter_ipv4/ip_tables.h
index c0dac16..1ba09f7 100644
--- a/original/linux/netfilter_ipv4/ip_tables.h
+++ b/original/linux/netfilter_ipv4/ip_tables.h
@@ -28,7 +28,7 @@
#include <linux/netfilter/x_tables.h>
#define IPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define IPT_TABLE_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
+#define IPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
#define ipt_match xt_match
#define ipt_target xt_target
#define ipt_table xt_table