summaryrefslogtreecommitdiffstats
path: root/net/ethtool/tunnels.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2021-12-14 00:42:30 -0800
committerDavid S. Miller <davem@davemloft.net>2021-12-15 10:27:47 +0000
commit34ac17ecbf575eb079094d44f1bd30c66897aa21 (patch)
tree2b548e07ac179eb8b5dbcb8f45a953c0baf1ef6e /net/ethtool/tunnels.c
parent6cf7a1ac0fedad8a70c050ade8a27a2071638500 (diff)
downloadlinux-stable-34ac17ecbf575eb079094d44f1bd30c66897aa21.tar.gz
linux-stable-34ac17ecbf575eb079094d44f1bd30c66897aa21.tar.bz2
linux-stable-34ac17ecbf575eb079094d44f1bd30c66897aa21.zip
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>
Diffstat (limited to 'net/ethtool/tunnels.c')
-rw-r--r--net/ethtool/tunnels.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ethtool/tunnels.c b/net/ethtool/tunnels.c
index e7f2ee0d2471..efde33536687 100644
--- 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;
}