The bridge-netfilter code will overwrite memory if there is not headroom
in the skb to save the header. This first showed up when using Xen with
sky2 driver that doesn't allocate the extra space.
Signed-off-by: Stephen Hemminger <[EMAIL PROTECTED]>
--- br-nf.orig/include/linux/netfilter_bridge.h 2006-08-22 16:43:41.000000000
-0700
+++ br-nf/include/linux/netfilter_bridge.h 2006-08-22 16:45:05.000000000
-0700
@@ -48,15 +48,25 @@
/* Only used in br_forward.c */
static inline
-void nf_bridge_maybe_copy_header(struct sk_buff *skb)
+int nf_bridge_maybe_copy_header(struct sk_buff *skb)
{
+ int err;
+
if (skb->nf_bridge) {
if (skb->protocol == __constant_htons(ETH_P_8021Q)) {
+ err = skb_cow(skb, 18);
+ if (err)
+ return err;
memcpy(skb->data - 18, skb->nf_bridge->data, 18);
skb_push(skb, 4);
- } else
+ } else {
+ err = skb_cow(skb, 16);
+ if (err)
+ return err;
memcpy(skb->data - 16, skb->nf_bridge->data, 16);
+ }
}
+ return 0;
}
/* This is called by the IP fragmenting code and it ensures there is
--- br-nf.orig/net/bridge/br_forward.c 2006-08-22 16:43:41.000000000 -0700
+++ br-nf/net/bridge/br_forward.c 2006-08-22 16:44:04.000000000 -0700
@@ -40,11 +40,15 @@
else {
#ifdef CONFIG_BRIDGE_NETFILTER
/* ip_refrag calls ip_fragment, doesn't copy the MAC header. */
- nf_bridge_maybe_copy_header(skb);
+ if (nf_bridge_maybe_copy_header(skb))
+ kfree_skb(skb);
+ else
#endif
- skb_push(skb, ETH_HLEN);
+ {
+ skb_push(skb, ETH_HLEN);
- dev_queue_xmit(skb);
+ dev_queue_xmit(skb);
+ }
}
return 0;
--
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
