| Message ID | 1522074764-22678-1-git-send-email-weiyongjun1@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] tipc: fix error handling in tipc_udp_enable() | expand |
Acked-by: Jon Maloy <jon.maloy@ericsson.com> Thank you, Wei. > -----Original Message----- > From: Wei Yongjun [mailto:weiyongjun1@huawei.com] > Sent: Monday, March 26, 2018 10:33 > To: Jon Maloy <jon.maloy@ericsson.com>; Ying Xue > <ying.xue@windriver.com> > Cc: Wei Yongjun <weiyongjun1@huawei.com>; netdev@vger.kernel.org; > tipc-discussion@lists.sourceforge.net; kernel-janitors@vger.kernel.org > Subject: [PATCH net-next] tipc: fix error handling in tipc_udp_enable() > > Release alloced resource before return from the error handling case in > tipc_udp_enable(), otherwise will cause memory leak. > > Fixes: 52dfae5c85a4 ("tipc: obtain node identity from interface by default") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > net/tipc/udp_media.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index > 2c13b18..e7d91f5 100644 > --- a/net/tipc/udp_media.c > +++ b/net/tipc/udp_media.c > @@ -687,7 +687,8 @@ static int tipc_udp_enable(struct net *net, struct > tipc_bearer *b, > } > if (!tipc_own_id(net)) { > pr_warn("Failed to set node id, please configure > manually\n"); > - return -EINVAL; > + err = -EINVAL; > + goto err; > } > > b->bcast_addr.media_id = TIPC_MEDIA_TYPE_UDP;
From: Wei Yongjun <weiyongjun1@huawei.com> Date: Mon, 26 Mar 2018 14:32:44 +0000 > Release alloced resource before return from the error handling > case in tipc_udp_enable(), otherwise will cause memory leak. > > Fixes: 52dfae5c85a4 ("tipc: obtain node identity from interface by default") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied.
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 2c13b18..e7d91f5 100644 --- a/net/tipc/udp_media.c +++ b/net/tipc/udp_media.c @@ -687,7 +687,8 @@ static int tipc_udp_enable(struct net *net, struct tipc_bearer *b, } if (!tipc_own_id(net)) { pr_warn("Failed to set node id, please configure manually\n"); - return -EINVAL; + err = -EINVAL; + goto err; } b->bcast_addr.media_id = TIPC_MEDIA_TYPE_UDP;
Release alloced resource before return from the error handling case in tipc_udp_enable(), otherwise will cause memory leak. Fixes: 52dfae5c85a4 ("tipc: obtain node identity from interface by default") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- net/tipc/udp_media.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)