[PATCH 69/81] bridge: Pull ip header into skb->data before looking into ip header.

From: Herton Ronaldo Krzesinski
Date: Tue Feb 19 2013 - 13:58:34 EST -stable review patch. If anyone has any objections, please let me know.


From: Sarveshwar Bandi <sarveshwar.bandi@xxxxxxxxxx>

commit 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 upstream.

If lower layer driver leaves the ip header in the skb fragment, it needs to
be first pulled into skb->data before inspecting ip header length or ip version

Signed-off-by: Sarveshwar Bandi <sarveshwar.bandi@xxxxxxxxxx>
Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@xxxxxxxxxxxxx>
net/bridge/br_netfilter.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
index e41456b..ab52468 100644
--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -256,6 +256,9 @@ static int br_parse_ip_options(struct sk_buff *skb)
struct net_device *dev = skb->dev;
u32 len;

+ if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+ goto inhdr_error;
iph = ip_hdr(skb);
opt = &(IPCB(skb)->opt);


To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/