PHY drivers should be able to rely on the caller of {get,set}_tunable to
have acquired the PHY device mutex, in order to both serialize against
concurrent calls of these functions, but also against PHY state machine
changes. All ethtool PHY-level functions do this, except
{get,set}_tunable, so we make them consistent here as well.

Fixes: 968ad9da7e0e ("ethtool: Implements 
ETHTOOL_PHY_GTUNABLE/ETHTOOL_PHY_STUNABLE")
Signed-off-by: Florian Fainelli <f.faine...@gmail.com>
---
 net/core/ethtool.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index e9b4556751ff..0adb3bec5b5a 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -2466,7 +2466,9 @@ static int get_phy_tunable(struct net_device *dev, void 
__user *useraddr)
        data = kmalloc(tuna.len, GFP_USER);
        if (!data)
                return -ENOMEM;
+       mutex_lock(&phydev->lock);
        ret = phydev->drv->get_tunable(phydev, &tuna, data);
+       mutex_unlock(&phydev->lock);
        if (ret)
                goto out;
        useraddr += sizeof(tuna);
@@ -2501,7 +2503,9 @@ static int set_phy_tunable(struct net_device *dev, void 
__user *useraddr)
        ret = -EFAULT;
        if (copy_from_user(data, useraddr, tuna.len))
                goto out;
+       mutex_lock(&phydev->lock);
        ret = phydev->drv->set_tunable(phydev, &tuna, data);
+       mutex_unlock(&phydev->lock);
 
 out:
        kfree(data);
-- 
2.9.3

Reply via email to