From: juhosg Date: Sun, 25 Nov 2012 16:23:02 +0000 (+0000) Subject: AA: generic: ar8216: fix port number check in 'ar8xxx_mib_work_func' X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=7931b6c13db572b93df431bf4e049303d4e7b72d;p=12.09%2Fopenwrt.git AA: generic: ar8216: fix port number check in 'ar8xxx_mib_work_func' Backport of r34283. Also add a WARN_ON to 'ar8216_mib_fetch_port_stat' Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34371 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 8fc1f4b..6187d52 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -425,6 +425,8 @@ ar8216_mib_fetch_port_stat(struct ar8216_priv *priv, int port, bool flush) u64 *mib_stats; int i; + WARN_ON(port >= priv->dev.ports); + lockdep_assert_held(&priv->mib_lock); if (chip_is_ar8327(priv)) @@ -1710,7 +1712,7 @@ ar8xxx_mib_work_func(struct work_struct *work) next_port: priv->mib_next_port++; - if (priv->mib_next_port > priv->dev.ports) + if (priv->mib_next_port >= priv->dev.ports) priv->mib_next_port = 0; mutex_unlock(&priv->mib_lock);