summaryrefslogtreecommitdiffstats
path: root/net/decnet
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-17 20:47:07 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-17 20:47:07 -0700
commita01c1335a308ee660518e33db03fb5f5e1dfc166 (patch)
treebd31d76a300b1c2655e026e9f618a4224bf5370e /net/decnet
parent482e3febc2e7df78411005dcdd7621c16b98b088 (diff)
downloadop-kernel-dev-a01c1335a308ee660518e33db03fb5f5e1dfc166.zip
op-kernel-dev-a01c1335a308ee660518e33db03fb5f5e1dfc166.tar.gz
decnet: Don't leak entries when rebuilding zone.
As noticed by Ben Hutchings, when we move entries from one table to another we leak all except the first entry. Put back the "next" variable removed by commit 9bf9055eb716f85372c41b3fbc51f90bc7653740 ("decnet: Fix set-but-unused variable.") and use it properly. Reported-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/decnet')
-rw-r--r--net/decnet/dn_table.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/decnet/dn_table.c b/net/decnet/dn_table.c
index d8ea583..bd0a52d 100644
--- a/net/decnet/dn_table.c
+++ b/net/decnet/dn_table.c
@@ -123,11 +123,12 @@ static inline void dn_rebuild_zone(struct dn_zone *dz,
struct dn_fib_node **old_ht,
int old_divisor)
{
+ struct dn_fib_node *f, **fp, *next;
int i;
- struct dn_fib_node *f, **fp;
for(i = 0; i < old_divisor; i++) {
- for(f = old_ht[i]; f; f = f->fn_next) {
+ for(f = old_ht[i]; f; f = next) {
+ next = f->fn_next;
for(fp = dn_chain_p(f->fn_key, dz);
*fp && dn_key_leq((*fp)->fn_key, f->fn_key);
fp = &(*fp)->fn_next)
OpenPOWER on IntegriCloud