diff options
| author |   Robert Hancock <hancock@sedsystems.ca> | 2019-06-12 14:33:32 -0600 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-06-14 19:10:03 -0700 |
| commit | 6bb9e376c2a4cc5120c3bf5fd3048b9a0a6ec1f8 (patch) | |
| tree | f9edb2d3346b55ab3d528ab36349a76d1e4413ce /drivers/net/dsa | |
| parent | Merge branch 'qmi_wwan-fix-QMAP-handling' (diff) | |
| download | linux-dev-6bb9e376c2a4cc5120c3bf5fd3048b9a0a6ec1f8.tar.xz linux-dev-6bb9e376c2a4cc5120c3bf5fd3048b9a0a6ec1f8.zip | |
net: dsa: microchip: Don't try to read stats for unused ports
If some of the switch ports were not listed in the device tree, due to
being unused, the ksz_mib_read_work function ended up accessing a NULL
dp->slave pointer and causing an oops. Skip checking statistics for any
unused ports.
Fixes: 7c6ff470aa867f53 ("net: dsa: microchip: add MIB counter reading support")
Signed-off-by: Robert Hancock <hancock@sedsystems.ca>
Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/microchip/ksz_common.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 39dace8e3512..f46086fa9064 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -83,6 +83,9 @@ static void ksz_mib_read_work(struct work_struct *work) int i; for (i = 0; i < dev->mib_port_cnt; i++) { + if (dsa_is_unused_port(dev->ds, i)) + continue; + p = &dev->ports[i]; mib = &p->mib; mutex_lock(&mib->cnt_mutex); |