| Message ID | 20180725100049.20244-1-yuehaibing@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] tipc: add missing dev_put() on error in tipc_enable_l2_media | expand |
Acked ///Jon Maloy > -----Original Message----- > From: netdev-owner@vger.kernel.org <netdev-owner@vger.kernel.org> On Behalf Of YueHaibing > Sent: Wednesday, 25 July, 2018 05:01 > To: davem@davemloft.net; Jon Maloy <jon.maloy@ericsson.com>; ying.xue@windriver.com > Cc: linux-kernel@vger.kernel.org; netdev@vger.kernel.org; tipc-discussion@lists.sourceforge.net; YueHaibing > <yuehaibing@huawei.com> > Subject: [PATCH net-next] tipc: add missing dev_put() on error in tipc_enable_l2_media > > when tipc_own_id failed to obtain node identity,dev_put should > be call before return -EINVAL. > > Fixes: 682cd3cf946b ("tipc: confgiure and apply UDP bearer MTU on running links") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > net/tipc/bearer.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c > index fd6d8f1..418f03d 100644 > --- a/net/tipc/bearer.c > +++ b/net/tipc/bearer.c > @@ -395,6 +395,7 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b, > tipc_net_init(net, node_id, 0); > } > if (!tipc_own_id(net)) { > + dev_put(dev); > pr_warn("Failed to obtain node identity\n"); > return -EINVAL; > } > -- > 2.7.0 >
From: YueHaibing <yuehaibing@huawei.com> Date: Wed, 25 Jul 2018 18:00:49 +0800 > when tipc_own_id failed to obtain node identity,dev_put should > be call before return -EINVAL. > > Fixes: 682cd3cf946b ("tipc: confgiure and apply UDP bearer MTU on running links") > Signed-off-by: YueHaibing <yuehaibing@huawei.com> Applied to net-next, thank you.
diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c index fd6d8f1..418f03d 100644 --- a/net/tipc/bearer.c +++ b/net/tipc/bearer.c @@ -395,6 +395,7 @@ int tipc_enable_l2_media(struct net *net, struct tipc_bearer *b, tipc_net_init(net, node_id, 0); } if (!tipc_own_id(net)) { + dev_put(dev); pr_warn("Failed to obtain node identity\n"); return -EINVAL; }
when tipc_own_id failed to obtain node identity,dev_put should be call before return -EINVAL. Fixes: 682cd3cf946b ("tipc: confgiure and apply UDP bearer MTU on running links") Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- net/tipc/bearer.c | 1 + 1 file changed, 1 insertion(+)