inetpeer: fix RCU lookup() again

edumazet · davem330 · commit 35f493b87ec0 · 2017-09-28T09:39:34.000-07:00
My prior fix was not complete, as we were dereferencing a pointer three times per node, not twice as I initially thought. Fixes: 4cc5b44 ("inetpeer: fix RCU lookup()") Fixes: b145425 ("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>
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,9 @@ static struct inet_peer lookup(const struct inetpeer_addr daddr,`
`128`	`128`	`break;`
`129`	`129`	`}`
`130`	`130`	`if (cmp == -1)`
`131`		`- pp = &(*pp)->rb_left;`
	`131`	`+ pp = &next->rb_left;`
`132`	`132`	`else`
`133`		`- pp = &(*pp)->rb_right;`
	`133`	`+ pp = &next->rb_right;`
`134`	`134`	`}`
`135`	`135`	`*parent_p = parent;`
`136`	`136`	`*pp_p = pp;`