diff for duplicates of <4BDF2FD5.2030509@simon.arlott.org.uk> diff --git a/a/1.txt b/N1/1.txt index f72095b..208838a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ In ppp_input(), PPP_PROTO(skb) may refer to invalid data in the skb. -If this happens and (proto >= 0xc000 || proto = PPP_CCPFRAG) then +If this happens and (proto >= 0xc000 || proto == PPP_CCPFRAG) then the packet is passed directly to pppd. This occurs frequently when using PPPoE with an interface MTU @@ -23,7 +23,7 @@ index 6e281bc..75e8903 100644 struct channel *pch = chan->ppp; int proto; -- if (!pch || skb->len = 0) { +- if (!pch || skb->len == 0) { + if (!pch) { kfree_skb(skb); return; @@ -41,7 +41,7 @@ index 6e281bc..75e8903 100644 + } + + proto = PPP_PROTO(skb); - if (!pch->ppp || proto >= 0xc000 || proto = PPP_CCPFRAG) { + if (!pch->ppp || proto >= 0xc000 || proto == PPP_CCPFRAG) { /* put it on the channel queue */ skb_queue_tail(&pch->file.rq, skb); @@ -1585,6 +1594,8 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb) @@ -62,7 +62,7 @@ index 6e281bc..75e8903 100644 + if (skb->len > 0) { #ifdef CONFIG_PPP_MULTILINK /* XXX do channel-level decompression here */ - if (PPP_PROTO(skb) = PPP_MP) + if (PPP_PROTO(skb) == PPP_MP) @@ -1625,15 +1637,10 @@ ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch) else #endif /* CONFIG_PPP_MULTILINK */ diff --git a/a/content_digest b/N1/content_digest index 8bab1b3..c4e7ea9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Simon Arlott <simon@fire.lp0.eu>\0" - "Subject\0[PATCH v2 1/2] ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is\0" - "Date\0Mon, 03 May 2010 20:19:33 +0000\0" + "Subject\0[PATCH v2 1/2] ppp_generic: pull 2 bytes so that PPP_PROTO(skb) is valid\0" + "Date\0Mon, 03 May 2010 21:19:33 +0100\0" "To\0David Miller <davem@davemloft.net>\0" "Cc\0netdev <netdev@vger.kernel.org>" paulus@samba.org @@ -9,7 +9,7 @@ "b\0" "In ppp_input(), PPP_PROTO(skb) may refer to invalid data in the skb.\n" "\n" - "If this happens and (proto >= 0xc000 || proto = PPP_CCPFRAG) then\n" + "If this happens and (proto >= 0xc000 || proto == PPP_CCPFRAG) then\n" "the packet is passed directly to pppd.\n" "\n" "This occurs frequently when using PPPoE with an interface MTU\n" @@ -32,7 +32,7 @@ " \tstruct channel *pch = chan->ppp;\n" " \tint proto;\n" " \n" - "-\tif (!pch || skb->len = 0) {\n" + "-\tif (!pch || skb->len == 0) {\n" "+\tif (!pch) {\n" " \t\tkfree_skb(skb);\n" " \t\treturn;\n" @@ -50,7 +50,7 @@ "+\t}\n" "+\n" "+\tproto = PPP_PROTO(skb);\n" - " \tif (!pch->ppp || proto >= 0xc000 || proto = PPP_CCPFRAG) {\n" + " \tif (!pch->ppp || proto >= 0xc000 || proto == PPP_CCPFRAG) {\n" " \t\t/* put it on the channel queue */\n" " \t\tskb_queue_tail(&pch->file.rq, skb);\n" "@@ -1585,6 +1594,8 @@ ppp_input(struct ppp_channel *chan, struct sk_buff *skb)\n" @@ -71,7 +71,7 @@ "+\tif (skb->len > 0) {\n" " #ifdef CONFIG_PPP_MULTILINK\n" " \t\t/* XXX do channel-level decompression here */\n" - " \t\tif (PPP_PROTO(skb) = PPP_MP)\n" + " \t\tif (PPP_PROTO(skb) == PPP_MP)\n" "@@ -1625,15 +1637,10 @@ ppp_receive_frame(struct ppp *ppp, struct sk_buff *skb, struct channel *pch)\n" " \t\telse\n" " #endif /* CONFIG_PPP_MULTILINK */\n" @@ -97,4 +97,4 @@ "-- \n" Simon Arlott -31a15d5222075891788826224dc73d93af439eeed7ad50bc7f45ec99147fd20e +3f116a2f9c84c194387f179db2077f70d0de87a069c239545b5cf678fac3ade0
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.