ethtool: use ethnl_parse_header_dev_put()

It seems I missed that most ethnl_parse_header_dev_get() callers
declare an on-stack struct ethnl_req_info, and that they simply call
dev_put(req_info.dev) when about to return.

Add ethnl_parse_header_dev_put() helper to properly untrack
reference taken by ethnl_parse_header_dev_get().

Fixes: e4b8954074f6 ("netlink: add net device refcount tracker to struct ethnl_req_info")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ethtool/cabletest.c b/net/ethtool/cabletest.c
index 63560bb..920aac0 100644 (file)
--- a/net/ethtool/cabletest.c
+++ b/net/ethtool/cabletest.c
@@ -96,7 +96,7 @@ int ethnl_act_cable_test(struct sk_buff *skb, struct genl_info *info)
 out_rtnl:
        rtnl_unlock();
 out_dev_put:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }
 
@@ -353,7 +353,7 @@ int ethnl_act_cable_test_tdr(struct sk_buff *skb, struct genl_info *info)
 out_rtnl:
        rtnl_unlock();
 out_dev_put:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }
  

diff --git a/net/ethtool/channels.c b/net/ethtool/channels.c
index 6a070dc..4031588 100644 (file)
--- a/net/ethtool/channels.c
+++ b/net/ethtool/channels.c
@@ -219,6 +219,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/coalesce.c b/net/ethtool/coalesce.c
index 46776ea..487bdf3 100644 (file)
--- a/net/ethtool/coalesce.c
+++ b/net/ethtool/coalesce.c
@@ -336,6 +336,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/debug.c b/net/ethtool/debug.c
index f99912d..d73888c 100644 (file)
--- a/net/ethtool/debug.c
+++ b/net/ethtool/debug.c
@@ -123,6 +123,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/eee.c b/net/ethtool/eee.c
index e10bfcc..45c42b2 100644 (file)
--- a/net/ethtool/eee.c
+++ b/net/ethtool/eee.c
@@ -185,6 +185,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/features.c b/net/ethtool/features.c
index 2e7331b..55d449a 100644 (file)
--- a/net/ethtool/features.c
+++ b/net/ethtool/features.c
@@ -283,6 +283,6 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)
 
 out_rtnl:
        rtnl_unlock();
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/fec.c b/net/ethtool/fec.c
index 8738daf..9f5a134 100644 (file)
--- a/net/ethtool/fec.c
+++ b/net/ethtool/fec.c
@@ -305,6 +305,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/linkinfo.c b/net/ethtool/linkinfo.c
index b918398..efa0f7f 100644 (file)
--- a/net/ethtool/linkinfo.c
+++ b/net/ethtool/linkinfo.c
@@ -149,6 +149,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/linkmodes.c b/net/ethtool/linkmodes.c
index f9eda59..99b29b4 100644 (file)
--- a/net/ethtool/linkmodes.c
+++ b/net/ethtool/linkmodes.c
@@ -358,6 +358,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/module.c b/net/ethtool/module.c
index bc2cef1..898ed43 100644 (file)
--- a/net/ethtool/module.c
+++ b/net/ethtool/module.c
@@ -175,6 +175,6 @@ out_ops:
        ethnl_ops_complete(dev);
 out_rtnl:
        rtnl_unlock();
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h
index a779bbb..75856db 100644 (file)
--- a/net/ethtool/netlink.h
+++ b/net/ethtool/netlink.h
@@ -235,6 +235,11 @@ struct ethnl_req_info {
        u32                     flags;
 };
 
+static inline void ethnl_parse_header_dev_put(struct ethnl_req_info *req_info)
+{
+       dev_put_track(req_info->dev, &req_info->dev_tracker);
+}
+
 /**
  * struct ethnl_reply_data - base type of reply data for GET requests
  * @dev:       device for current reply message; in single shot requests it is

diff --git a/net/ethtool/pause.c b/net/ethtool/pause.c
index ee1e580..a8c113d 100644 (file)
--- a/net/ethtool/pause.c
+++ b/net/ethtool/pause.c
@@ -181,6 +181,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/privflags.c b/net/ethtool/privflags.c
index fc9f3be..4c7bfa8 100644 (file)
--- a/net/ethtool/privflags.c
+++ b/net/ethtool/privflags.c
@@ -196,6 +196,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/rings.c b/net/ethtool/rings.c
index 450b886..c1d5f5e 100644 (file)
--- a/net/ethtool/rings.c
+++ b/net/ethtool/rings.c
@@ -196,6 +196,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }

diff --git a/net/ethtool/tunnels.c b/net/ethtool/tunnels.c
index e7f2ee0..efde335 100644 (file)
--- a/net/ethtool/tunnels.c
+++ b/net/ethtool/tunnels.c
@@ -195,7 +195,7 @@ int ethnl_tunnel_info_doit(struct sk_buff *skb, struct genl_info *info)
        if (ret)
                goto err_free_msg;
        rtnl_unlock();
-       dev_put(req_info.dev);
+       ethnl_parse_header_dev_put(&req_info);
        genlmsg_end(rskb, reply_payload);
 
        return genlmsg_reply(rskb, info);
@@ -204,7 +204,7 @@ err_free_msg:
        nlmsg_free(rskb);
 err_unlock_rtnl:
        rtnl_unlock();
-       dev_put(req_info.dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }
 
@@ -230,7 +230,7 @@ int ethnl_tunnel_info_start(struct netlink_callback *cb)
                                         sock_net(cb->skb->sk), cb->extack,
                                         false);
        if (ctx->req_info.dev) {
-               dev_put(ctx->req_info.dev);
+               ethnl_parse_header_dev_put(&ctx->req_info);
                ctx->req_info.dev = NULL;
        }
 

diff --git a/net/ethtool/wol.c b/net/ethtool/wol.c
index ada7df2..88f435e 100644 (file)
--- a/net/ethtool/wol.c
+++ b/net/ethtool/wol.c
@@ -165,6 +165,6 @@ out_ops:
 out_rtnl:
        rtnl_unlock();
 out_dev:
-       dev_put(dev);
+       ethnl_parse_header_dev_put(&req_info);
        return ret;
 }