diff options
| author | Ben Greear <greearb@candelatech.com> | 2010-07-15 13:22:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-15 22:38:43 -0700 |
| commit | e40dbc51fbcc3281bb52ecf0f5bec693d36e2aea (patch) | |
| tree | 7950aa0bb0e2a338eed7d948c77cd62ec96bf0d8 /net | |
| parent | b0f77d0eae0c58a5a9691a067ada112ceeae2d00 (diff) | |
| download | op-kernel-dev-e40dbc51fbcc3281bb52ecf0f5bec693d36e2aea.zip op-kernel-dev-e40dbc51fbcc3281bb52ecf0f5bec693d36e2aea.tar.gz | |
ipmr: Don't leak memory if fib lookup fails.
This was detected using two mcast router tables. The
pimreg for the second interface did not have a specific
mrule, so packets received by it were handled by the
default table, which had nothing configured.
This caused the ipmr_fib_lookup to fail, causing
the memory leak.
Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ipmr.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 757f25eb..7f62735 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -442,8 +442,10 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, struct net_device *dev) int err; err = ipmr_fib_lookup(net, &fl, &mrt); - if (err < 0) + if (err < 0) { + kfree_skb(skb); return err; + } read_lock(&mrt_lock); dev->stats.tx_bytes += skb->len; @@ -1728,8 +1730,10 @@ int ip_mr_input(struct sk_buff *skb) goto dont_forward; err = ipmr_fib_lookup(net, &skb_rtable(skb)->fl, &mrt); - if (err < 0) + if (err < 0) { + kfree_skb(skb); return err; + } if (!local) { if (IPCB(skb)->opt.router_alert) { |
