Re: shutdown oops in xt_compat_calc_jump

[dann frazier <dannf@dannf.org>]

On Wed, Apr 06, 2011 at 06:49:27PM +0200, Eric Dumazet wrote:
> Le mercredi 06 avril 2011 à 18:44 +0200, Eric Dumazet a écrit :
> > Le mercredi 06 avril 2011 à 10:25 -0600, dann frazier a écrit :
> > 
> > > Thanks Eric. Unfortunately that didn't solve the problem I am seeing.
> > > I rebaselined (same kernel build as before), and found that I'm able
> > > to reproduce this 100% of the time by running only:
> > > 
> > >   sudo ebtables -t filter --init-table
> > > 
> > > The backtrace I received was this:
> > 
> > 
> > Oh yeah, I forgot to remove the WARN_ON_ONCE(1) at the end of
> > xt_compat_calc_jump()
> > 
> > I focused on restoring ebtables (for example ebtables -A INPUT ...)
> > 
> > Just ignore the warning for the time being ;)
> > 
> > 
> > # ebtables -A INPUT -p arp -s 00:01:02:03:04:05 -j ACCEPT
> > # ebtables -A INPUT -p arp -s 00:01:02:03:04:06 -j ACCEPT
> > # ebtables -L
> > Bridge table: filter
> > 
> > Bridge chain: INPUT, entries: 2, policy: ACCEPT
> > -p ARP -s 0:1:2:3:4:5 -j ACCEPT 
> > -p ARP -s 0:1:2:3:4:6 -j ACCEPT 
> > 
> > Bridge chain: FORWARD, entries: 0, policy: ACCEPT
> > 
> > Bridge chain: OUTPUT, entries: 0, policy: ACCEPT
> > 

Tested-by: dann frazier <dannf@dannf.org>

Thanks!

> [PATCH] netfilter: fix ebtables
> 
> 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>
> ---
> V2: 	remove a comment from V1 (as Patrick suggested)
> 	remove the WARN_ON_ONCE() in xt_compat_calc_jump()
> 
> 
>  net/bridge/netfilter/ebtables.c |    3 ++-
>  net/netfilter/x_tables.c        |    4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
> index 893669c..c66aa80 100644
> --- a/net/bridge/netfilter/ebtables.c
> +++ b/net/bridge/netfilter/ebtables.c
> @@ -1766,7 +1766,7 @@ static int compat_table_info(const struct ebt_table_info *info,
>  
>  	newinfo->entries_size = size;
>  
> -	xt_compat_init_offsets(AF_INET, info->nentries);
> +	xt_compat_init_offsets(NFPROTO_BRIDGE, info->nentries);
>  	return EBT_ENTRY_ITERATE(entries, size, compat_calc_entry, info,
>  							entries, newinfo);
>  }
> @@ -2240,6 +2240,7 @@ static int compat_do_replace(struct net *net, void __user *user,
>  
>  	xt_compat_lock(NFPROTO_BRIDGE);
>  
> +	xt_compat_init_offsets(NFPROTO_BRIDGE, tmp.nentries);
>  	ret = compat_copy_entries(entries_tmp, tmp.entries_size, &state);
>  	if (ret < 0)
>  		goto out_unlock;
> diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
> index a9adf4c..8a025a5 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);
>  
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html