* bridge: Fix OOM crash in deliver_clone
@ 2010-06-16 4:02 Herbert Xu
2010-06-16 4:43 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Herbert Xu @ 2010-06-16 4:02 UTC (permalink / raw)
To: David S. Miller, netdev; +Cc: Mark Wagner
Hi Dave:
bridge: Fix OOM crash in deliver_clone
The bridge multicast patches introduced an OOM crash in the forward
path, when deliver_clone fails to clone the skb.
This patch fixes it.
Reported-by: Mark Wagner <mwagner@redhat.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index 6e97711..cbfe87f 100644
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -130,10 +130,10 @@ static int deliver_clone(const struct net_bridge_port *prev,
void (*__packet_hook)(const struct net_bridge_port *p,
struct sk_buff *skb))
{
+ struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
+
skb = skb_clone(skb, GFP_ATOMIC);
if (!skb) {
- struct net_device *dev = BR_INPUT_SKB_CB(skb)->brdev;
-
dev->stats.tx_dropped++;
return -ENOMEM;
}
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: bridge: Fix OOM crash in deliver_clone
2010-06-16 4:02 bridge: Fix OOM crash in deliver_clone Herbert Xu
@ 2010-06-16 4:43 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-06-16 4:43 UTC (permalink / raw)
To: herbert; +Cc: netdev, mwagner
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 16 Jun 2010 14:02:19 +1000
> Hi Dave:
>
> bridge: Fix OOM crash in deliver_clone
>
> The bridge multicast patches introduced an OOM crash in the forward
> path, when deliver_clone fails to clone the skb.
>
> This patch fixes it.
>
> Reported-by: Mark Wagner <mwagner@redhat.com>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-16 4:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-16 4:02 bridge: Fix OOM crash in deliver_clone Herbert Xu
2010-06-16 4:43 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).