Skip to content

Commit

Permalink
ipv6/ndisc: join error paths
Browse files Browse the repository at this point in the history
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ilpo Järvinen authored and David S. Miller committed Feb 7, 2009
1 parent 910d30b commit d73f080
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions net/ipv6/ndisc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1538,13 +1538,10 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
if (rt->rt6i_flags & RTF_GATEWAY) {
ND_PRINTK2(KERN_WARNING
"ICMPv6 Redirect: destination is not a neighbour.\n");
dst_release(dst);
return;
}
if (!xrlim_allow(dst, 1*HZ)) {
dst_release(dst);
return;
goto release;
}
if (!xrlim_allow(dst, 1*HZ))
goto release;

if (dev->addr_len) {
read_lock_bh(&neigh->lock);
Expand All @@ -1570,8 +1567,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,
ND_PRINTK0(KERN_ERR
"ICMPv6 Redirect: %s() failed to allocate an skb.\n",
__func__);
dst_release(dst);
return;
goto release;
}

skb_reserve(buff, LL_RESERVED_SPACE(dev));
Expand Down Expand Up @@ -1631,6 +1627,10 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh,

if (likely(idev != NULL))
in6_dev_put(idev);
return;

release:
dst_release(dst);
}

static void pndisc_redo(struct sk_buff *skb)
Expand Down

0 comments on commit d73f080

Please sign in to comment.