Subject: Re: [PATCH net-next] ipv4: ip_forward: perform skb->pkt_type check at the beginning

From: Sergei Shtylyov <[email-masked]>
Date: Wed, 12 Feb 2014 18:25:11 +0400

Hello.

On 12-02-2014 12:10, Denis Kirjanov wrote:

> Packets which have L2 address different from ours should be
> already filtered before entering into ip_forward().

> Perform that check at the beginning to avoid processing such packets.

> Signed-off-by: Denis Kirjanov <[email-masked]>
> ---
>   net/ipv4/ip_forward.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)

> diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
> index e9f1217..1a07056 100644
> --- a/net/ipv4/ip_forward.c
> +++ b/net/ipv4/ip_forward.c
> @@ -59,6 +59,10 @@ int ip_forward(struct sk_buff *skb)
>   	struct rtable *rt;	/* Route we use */
>   	struct ip_options *opt	= &(IPCB(skb)->opt);
>
> +    /* that should never happen */
> +    if (skb->pkt_type != PACKET_HOST)
> +        goto drop;
> +

    Please indent the code with tabs, not spaces.

>   	if (skb_warn_if_lro(skb))
>   		goto drop;
>
> @@ -68,9 +72,6 @@ int ip_forward(struct sk_buff *skb)
>   	if (IPCB(skb)->opt.router_alert && ip_call_ra_chain(skb))
>   		return NET_RX_SUCCESS;
>
> -	if (skb->pkt_type != PACKET_HOST)
> -		goto drop;
> -

    Like it was here.

WBR, Sergei