net: dsa: b53: Bound check ARL searches

ARL searches are done by reading two ARL entries at a time, do not cap
the search at 1024 which would only limit us to half of the possible ARL
capacity, but use b53_max_arl_entries() instead which does the right
multiplication between bins and indexes.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2020-04-30 11:49:10 -07:00 committed by David S. Miller
parent e3da4038f4
commit cd169d799b
2 changed files with 6 additions and 1 deletions

View File

@ -1702,7 +1702,7 @@ int b53_fdb_dump(struct dsa_switch *ds, int port,
break; break;
} }
} while (count++ < 1024); } while (count++ < b53_max_arl_entries(priv) / 2);
return 0; return 0;
} }

View File

@ -213,6 +213,11 @@ static inline int is58xx(struct b53_device *dev)
#define B53_CPU_PORT_25 5 #define B53_CPU_PORT_25 5
#define B53_CPU_PORT 8 #define B53_CPU_PORT 8
static inline unsigned int b53_max_arl_entries(struct b53_device *dev)
{
return dev->num_arl_buckets * dev->num_arl_bins;
}
struct b53_device *b53_switch_alloc(struct device *base, struct b53_device *b53_switch_alloc(struct device *base,
const struct b53_io_ops *ops, const struct b53_io_ops *ops,
void *priv); void *priv);