ethtool: fix reference leak in some *_SET handlers

Andrew noticed that some handlers for *_SET commands leak a netdev
reference if required ethtool_ops callbacks do not exist. A simple
reproducer would be e.g.

  ip link add veth1 type veth peer name veth2
  ethtool -s veth1 wol g
  ip link del veth1

Make sure dev_put() is called when ethtool_ops check fails.

v2: add Fixes tags

Fixes: a53f3d41e4d3 ("ethtool: set link settings with LINKINFO_SET request")
Fixes: bfbcfe2032e7 ("ethtool: set link modes related data with LINKMODES_SET request")
Fixes: e54d04e3afea ("ethtool: set message mask with DEBUG_SET request")
Fixes: 8d425b19b305 ("ethtool: set wake-on-lan settings with WOL_SET request")
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ethtool/debug.c b/net/ethtool/debug.c
index aaef4843e6baffb669267ef89c06a4850c87578d..92599ad7b3c2dd6b7183e408b2de2e2b234f3799 100644 (file)
--- a/net/ethtool/debug.c
+++ b/net/ethtool/debug.c
@@ -107,8 +107,9 @@ int ethnl_set_debug(struct sk_buff *skb, struct genl_info *info)
        if (ret < 0)
                return ret;
        dev = req_info.dev;
+       ret = -EOPNOTSUPP;
        if (!dev->ethtool_ops->get_msglevel || !dev->ethtool_ops->set_msglevel)
-               return -EOPNOTSUPP;
+               goto out_dev;
 
        rtnl_lock();
        ret = ethnl_ops_begin(dev);
@@ -129,6 +130,7 @@ out_ops:
        ethnl_ops_complete(dev);
 out_rtnl:
        rtnl_unlock();
+out_dev:
        dev_put(dev);
        return ret;
 }

diff --git a/net/ethtool/linkinfo.c b/net/ethtool/linkinfo.c
index 5d16cb4e8693d0b70666639c41b63a718e2f62c8..6e9e0b590bb57189aec25fb56ee661fb338f7a04 100644 (file)
--- a/net/ethtool/linkinfo.c
+++ b/net/ethtool/linkinfo.c
@@ -126,9 +126,10 @@ int ethnl_set_linkinfo(struct sk_buff *skb, struct genl_info *info)
        if (ret < 0)
                return ret;
        dev = req_info.dev;
+       ret = -EOPNOTSUPP;
        if (!dev->ethtool_ops->get_link_ksettings ||
            !dev->ethtool_ops->set_link_ksettings)
-               return -EOPNOTSUPP;
+               goto out_dev;
 
        rtnl_lock();
        ret = ethnl_ops_begin(dev);
@@ -162,6 +163,7 @@ out_ops:
        ethnl_ops_complete(dev);
 out_rtnl:
        rtnl_unlock();
+out_dev:
        dev_put(dev);
        return ret;
 }

diff --git a/net/ethtool/linkmodes.c b/net/ethtool/linkmodes.c
index 96f20be64553e289f505a66f396c89cffc72c23a..18cc37be2d9c2d94ba6343364855133aa27eac6a 100644 (file)
--- a/net/ethtool/linkmodes.c
+++ b/net/ethtool/linkmodes.c
@@ -338,9 +338,10 @@ int ethnl_set_linkmodes(struct sk_buff *skb, struct genl_info *info)
        if (ret < 0)
                return ret;
        dev = req_info.dev;
+       ret = -EOPNOTSUPP;
        if (!dev->ethtool_ops->get_link_ksettings ||
            !dev->ethtool_ops->set_link_ksettings)
-               return -EOPNOTSUPP;
+               goto out_dev;
 
        rtnl_lock();
        ret = ethnl_ops_begin(dev);
@@ -370,6 +371,7 @@ out_ops:
        ethnl_ops_complete(dev);
 out_rtnl:
        rtnl_unlock();
+out_dev:
        dev_put(dev);
        return ret;
 }

diff --git a/net/ethtool/wol.c b/net/ethtool/wol.c
index e1b8a65b64c4ba10333b0d418a586dedafcae8e6..55e1ecaaf739d9f97661103219fb21bd978a6ff3 100644 (file)
--- a/net/ethtool/wol.c
+++ b/net/ethtool/wol.c
@@ -128,8 +128,9 @@ int ethnl_set_wol(struct sk_buff *skb, struct genl_info *info)
        if (ret < 0)
                return ret;
        dev = req_info.dev;
+       ret = -EOPNOTSUPP;
        if (!dev->ethtool_ops->get_wol || !dev->ethtool_ops->set_wol)
-               return -EOPNOTSUPP;
+               goto out_dev;
 
        rtnl_lock();
        ret = ethnl_ops_begin(dev);
@@ -172,6 +173,7 @@ out_ops:
        ethnl_ops_complete(dev);
 out_rtnl:
        rtnl_unlock();
+out_dev:
        dev_put(dev);
        return ret;
 }