diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-04-21 10:57:21 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-21 10:57:21 +0200 |
| commit | 954d70388307eb1ccb328d9f960657022a316243 (patch) | |
| tree | 4dac6cba3d54ca81b71569cb032506bb95eac496 /net/netfilter | |
| parent | 358b1361bed42f4e6cbf8956a73aebf193957d4a (diff) | |
| download | blackbird-obmc-linux-954d70388307eb1ccb328d9f960657022a316243.tar.gz blackbird-obmc-linux-954d70388307eb1ccb328d9f960657022a316243.zip | |
netfilter: fix ebtables compat support
commit 255d0dc34068a976 (netfilter: x_table: speedup compat operations)
made ebtables not working anymore.
1) xt_compat_calc_jump() is not an exact match lookup
2) compat_table_info() has a typo in xt_compat_init_offsets() call
3) compat_do_replace() misses a xt_compat_init_offsets() call
Reported-by: dann frazier <dannf@dannf.org>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/x_tables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index a9adf4c6b299..8a025a585d2f 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -455,6 +455,7 @@ void xt_compat_flush_offsets(u_int8_t af) vfree(xt[af].compat_tab); xt[af].compat_tab = NULL; xt[af].number = 0; + xt[af].cur = 0; } } EXPORT_SYMBOL_GPL(xt_compat_flush_offsets); @@ -473,8 +474,7 @@ int xt_compat_calc_jump(u_int8_t af, unsigned int offset) else return mid ? tmp[mid - 1].delta : 0; } - WARN_ON_ONCE(1); - return 0; + return left ? tmp[left - 1].delta : 0; } EXPORT_SYMBOL_GPL(xt_compat_calc_jump); |
