diff options
| author | Matt Johnston <matt@codeconstruct.com.au> | 2022-02-22 07:17:39 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-03-18 03:38:55 +0300 |
| commit | 0c6fce90be999b31e6f6f576c38b97f1ae49f8a1 (patch) | |
| tree | 140dd11762678c964651c8ea373cd615d50a72a6 /net/mctp | |
| parent | fc1041c14e9d097927a4af384f8cf4c48e257972 (diff) | |
| download | linux-0c6fce90be999b31e6f6f576c38b97f1ae49f8a1.tar.xz | |
mctp: Fix incorrect netdev unref for extended addr
In the extended addressing local route output codepath
dev_get_by_index_rcu() doesn't take a dev_hold() so we shouldn't
dev_put().
OpenBMC-Staging-Count: 1
Signed-off-by: Matt Johnston <matt@codeconstruct.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit e297db3eadd7809170aea627ed3d9f714fa3da2d)
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'net/mctp')
| -rw-r--r-- | net/mctp/route.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/net/mctp/route.c b/net/mctp/route.c index 6f277e56b168..5078ce3315cf 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -838,7 +838,6 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, struct mctp_skb_cb *cb = mctp_cb(skb); struct mctp_route tmp_rt = {0}; struct mctp_sk_key *key; - struct net_device *dev; struct mctp_hdr *hdr; unsigned long flags; unsigned int mtu; @@ -851,12 +850,12 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, if (rt) { ext_rt = false; - dev = NULL; - if (WARN_ON(!rt->dev)) goto out_release; } else if (cb->ifindex) { + struct net_device *dev; + ext_rt = true; rt = &tmp_rt; @@ -866,7 +865,6 @@ int mctp_local_output(struct sock *sk, struct mctp_route *rt, rcu_read_unlock(); return rc; } - rt->dev = __mctp_dev_get(dev); rcu_read_unlock(); @@ -947,11 +945,9 @@ out_release: if (!ext_rt) mctp_route_release(rt); - dev_put(dev); mctp_dev_put(tmp_rt.dev); return rc; - } /* route management */ |