[ 20/22] bridge: Pull ip header into skb->data before looking into ip header.

From: Greg Kroah-Hartman
Date: Tue Feb 12 2013 - 15:38:57 EST

3.0-stable review patch. If anyone has any objections, please let me know.


From: Sarveshwar Bandi <sarveshwar.bandi@xxxxxxxxxx>

[ Upstream commit 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 ]

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: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
net/bridge/br_netfilter.c | 3 +++
1 file changed, 3 insertions(+)

--- a/net/bridge/br_netfilter.c
+++ b/net/bridge/br_netfilter.c
@@ -233,6 +233,9 @@ static int br_parse_ip_options(struct sk
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/