neigh: fix setting of default gc_* values
Subsystems (2)
PATCH 1/1 neigh: fix setting of default gc_* values
This patch fixes bug introduced by:
commit 1d4c8c29841b9991cdf3c7cc4ba7f96a94f104ca "neigh: restore old behaviour of default parms values"
The thing is that in neigh_sysctl_register, extra1 and extra2 which were previously set for NEIGH_VAR_GC_* are overwritten. That leads to nonsense int limits for gc_* variables. So fix this by not touching extra* fields for gc_* variables.
--- net/core/neighbour.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/neighbour.c +1 -1
@@ -3046,7 +3046,7 @@ int neigh_sysctl_register(struct net_device *dev, struct neigh_parms *p,if (!t) goto err; -for (i =0 ; i <ARRAY_SIZE (t->neigh_vars); i++) { +for (i =0 ; i <NEIGH_VAR_GC_INTERVAL ; i++) { t->neigh_vars[i].data += (long ) p; t->neigh_vars[i].extra1 = dev; t->neigh_vars[i].extra2 = p;
Signature · 1 line
1.8.5.3
David Miller
maintainerFrom: Jiri Pirko <[email protected]>
Date: Fri, 21 Feb 2014 14:52:57 +0100
Quoted 10 lines
This patch fixes bug introduced by:
commit1d4c8c29841b9991cdf3c7cc4ba7f96a94f104ca"neigh: restore old behaviour of default parms values"The thing is that in
neigh_sysctl_register, extra1 and extra2 which were previously set for NEIGH_VAR_GC_* are overwritten. That leads to nonsense int limits for gc_* variables. So fix this by not touching extra* fields for gc_* variables.Signed-off-by Jiri Pirko <[email protected]>
Good catch, applied and queued up for -stable.
Thanks!