2019-01-05 16:53:49

by Gustavo A. R. Silva

Subject: [PATCH] tipc: fix memory leak in tipc_nl_compat_publ_dump

There is a memory leak in case genlmsg_put fails.

Fix this by freeing *args* before return.

Addresses-Coverity-ID: 1476406 ("Resource leak")
Fixes: 46273cf7e009 ("tipc: fix a missing check of genlmsg_put")
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
net/tipc/netlink_compat.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 40f5cae623a7..77e4b2418f30 100644
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -904,8 +904,10 @@ static int tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg, u32 sock)

hdr = genlmsg_put(args, 0, 0, &tipc_genl_family, NLM_F_MULTI,
TIPC_NL_PUBL_GET);
- if (!hdr)
+ if (!hdr) {
+ kfree_skb(args);
return -EMSGSIZE;
+ }

nest = nla_nest_start(args, TIPC_NLA_SOCK);
if (!nest) {
--
2.20.1

2019-01-06 05:52:34

by Ying Xue

Subject: Re: [PATCH] tipc: fix memory leak in tipc_nl_compat_publ_dump

On 1/6/19 12:52 AM, Gustavo A. R. Silva wrote:
> There is a memory leak in case genlmsg_put fails.
>
> Fix this by freeing *args* before return.
>
> Addresses-Coverity-ID: 1476406 ("Resource leak")
> Fixes: 46273cf7e009 ("tipc: fix a missing check of genlmsg_put")
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Acked-by: Ying Xue <[email protected]>

> ---
> net/tipc/netlink_compat.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
> index 40f5cae623a7..77e4b2418f30 100644
> --- a/net/tipc/netlink_compat.c
> +++ b/net/tipc/netlink_compat.c
> @@ -904,8 +904,10 @@ static int tipc_nl_compat_publ_dump(struct tipc_nl_compat_msg *msg, u32 sock)
>
> hdr = genlmsg_put(args, 0, 0, &tipc_genl_family, NLM_F_MULTI,
> TIPC_NL_PUBL_GET);
> - if (!hdr)
> + if (!hdr) {
> + kfree_skb(args);
> return -EMSGSIZE;
> + }
>
> nest = nla_nest_start(args, TIPC_NLA_SOCK);
> if (!nest) {
>

2019-01-07 18:01:27

by David Miller

Subject: Re: [PATCH] tipc: fix memory leak in tipc_nl_compat_publ_dump

From: "Gustavo A. R. Silva" <[email protected]>
Date: Sat, 5 Jan 2019 10:52:23 -0600

> There is a memory leak in case genlmsg_put fails.
>
> Fix this by freeing *args* before return.
>
> Addresses-Coverity-ID: 1476406 ("Resource leak")
> Fixes: 46273cf7e009 ("tipc: fix a missing check of genlmsg_put")
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Applied, thank you.