aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/inetpeer.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-09-25 08:40:02 -0700
committerDavid S. Miller <davem@davemloft.net>2017-09-28 09:39:34 -0700
commit35f493b87ec072c5a2497ffbee243095ef725827 (patch)
tree0ba331cf269c9890debdf6f6606b2239a24341a6 /net/ipv4/inetpeer.c
parentMerge branch 'mvpp2-various-fixes' (diff)
downloadlinux-dev-35f493b87ec072c5a2497ffbee243095ef725827.tar.xz
linux-dev-35f493b87ec072c5a2497ffbee243095ef725827.zip
inetpeer: fix RCU lookup() again
My prior fix was not complete, as we were dereferencing a pointer three times per node, not twice as I initially thought. Fixes: 4cc5b44b29a9 ("inetpeer: fix RCU lookup()") Fixes: b145425f269a ("inetpeer: remove AVL implementation in favor of RB tree") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inetpeer.c')
-rw-r--r--net/ipv4/inetpeer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
index e7eb590c86ce..b20c8ac64081 100644
--- a/net/ipv4/inetpeer.c
+++ b/net/ipv4/inetpeer.c
@@ -128,9 +128,9 @@ static struct inet_peer *lookup(const struct inetpeer_addr *daddr,
break;
}
if (cmp == -1)
- pp = &(*pp)->rb_left;
+ pp = &next->rb_left;
else
- pp = &(*pp)->rb_right;
+ pp = &next->rb_right;
}
*parent_p = parent;
*pp_p = pp;