diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-12-18 20:51:43 +0100 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-12-18 20:51:43 +0100 |
| commit | d0354e3ba19cdf9acc2ca89bbb59b1e6292a4f44 (patch) | |
| tree | e2de02bc6b0b1f1f67f33608bbbd9cf83c73c638 /net | |
| parent | 17735bd9822900d82278842f6bbe7a0e1c64c3b1 (diff) | |
bridge-netfilter: don't overwrite memory outside of skb
The bridge netfilter code needs to check for space at the
front of the skb before overwriting; otherwise if skb from
device doesn't have headroom, then it will cause random
memory corruption.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_forward.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index 2d24fb400e0c..dac7f0698193 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -37,11 +37,15 @@ int br_dev_queue_push_xmit(struct sk_buff *skb) 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; |