Re: [Bridge] [PATCH] bridge: Fix crash with vlan filtering and tcpdump

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 03/27/2014 11:27 PM, Vlad Yasevich wrote:

> When the vlan filtering is enabled on the bridge, but
> the filter is not configured on the bridge device itself,
> running tcpdump on the bridge device will result in a
> an Oops with NULL pointer dereference.  The reason
> is that br_pass_frame_up() will bypass the vlan
> check because promisc flag is set.  It will then try
> to get the table pointer and process the packet based
> on the table.  Since the table pointer is NULL, we oops.
> Catch this special condition in br_handle_vlan().

> Reported-by: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
> CC: Toshiaki Makita <makita.toshiaki@lab.ntt.co.jp>
> Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
> ---
> * Changed to use kfree_skb() instead of kfree_skb_list() to
>    match the reset of bridge code.
>   net/bridge/br_input.c | 11 ++++++-----
>   net/bridge/br_vlan.c  | 14 ++++++++++++++
>   2 files changed, 20 insertions(+), 5 deletions(-)

> diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
> index 28d5446..d0cca3c 100644
> --- a/net/bridge/br_input.c
> +++ b/net/bridge/br_input.c
[...]
> diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
> index 8249ca7..b153cc4 100644
> --- a/net/bridge/br_vlan.c
> +++ b/net/bridge/br_vlan.c
> @@ -144,6 +144,20 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br,
>   	if (!br->vlan_enabled)
>   		goto out;
>
> +	/* Vlan filter table must be configured at this point.  The
> +	 * only exception is the bridge is set in promisc mode and the
> +	 * packet is destined for the bridge device.  In this case
> +	 * pass the packet as is.
> +	 */
> +	if (!pv) {
> +		if ((br->dev->flags & IFF_PROMISC) && skb->dev == br->dev)
> +			goto out;
> +		else {
> +			kfree_skb(skb);
> +			return NULL;
> +		}

    All arms of the *if* statement should have {} if at least one arm as them; 
see Documentation/CodingStyle.

WBR, Sergei