[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100502.232520.146109082.davem@davemloft.net>
Date: Sun, 02 May 2010 23:25:20 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: simon@...e.lp0.eu
Cc: netdev@...r.kernel.org, paulus@...ba.org, linux-ppp@...r.kernel.org
Subject: Re: [PATCH 1/2] ppp_generic: pull 2 bytes so that PPP_PROTO(skb)
is valid
From: Simon Arlott <simon@...e.lp0.eu>
Date: Fri, 30 Apr 2010 19:41:17 +0100
> @@ -1572,8 +1572,18 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb)
> return;
> }
>
> - proto = PPP_PROTO(skb);
> +
> read_lock_bh(&pch->upl);
> + if (!pskb_may_pull(skb, 2)) {
> + kfree_skb(skb);
> + if (pch->ppp) {
> + ++pch->ppp->dev->stats.rx_length_errors;
> + ppp_receive_error(pch->ppp);
> + }
> + goto done;
> + }
> +
> + proto = PPP_PROTO(skb);
This makes the skb->len == 0 test at the beginning completely redundant.
Put your pskb_may_pull(skb, 2) call there and remove the skb->len==0
check entirely.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists