2017-06-05 00:57:31

by Haishuang Yan

Subject: [PATCH v2] devlink: fix potential memort leak

We must free allocated skb when genlmsg_put() return fails.

Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
Signed-off-by: Haishuang Yan <[email protected]>

---
Changes in v2:
- Fix same issue in headers_fill.
---
net/core/devlink.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/net/core/devlink.c b/net/core/devlink.c
index b0b87a2..a0adfc3 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1680,8 +1680,10 @@ static int devlink_dpipe_tables_fill(struct genl_info *info,

hdr = genlmsg_put(skb, info->snd_portid, info->snd_seq,
&devlink_nl_family, NLM_F_MULTI, cmd);
- if (!hdr)
+ if (!hdr) {
+ nlmsg_free(skb);
return -EMSGSIZE;
+ }

if (devlink_nl_put_handle(skb, devlink))
goto nla_put_failure;
@@ -2098,8 +2100,10 @@ static int devlink_dpipe_headers_fill(struct genl_info *info,

hdr = genlmsg_put(skb, info->snd_portid, info->snd_seq,
&devlink_nl_family, NLM_F_MULTI, cmd);
- if (!hdr)
+ if (!hdr) {
+ nlmsg_free(skb);
return -EMSGSIZE;
+ }

if (devlink_nl_put_handle(skb, devlink))
goto nla_put_failure;
--
1.8.3.1

2017-06-05 04:51:25

by Jiri Pirko

Subject: Re: [PATCH v2] devlink: fix potential memort leak

Mon, Jun 05, 2017 at 02:57:21AM CEST, [email protected] wrote:
>We must free allocated skb when genlmsg_put() return fails.
>
>Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
>Signed-off-by: Haishuang Yan <[email protected]>

Acked-by: Jiri Pirko <[email protected]>

Thanks.

2017-06-05 15:28:25

by David Miller

Subject: Re: [PATCH v2] devlink: fix potential memort leak

From: Haishuang Yan <[email protected]>
Date: Mon, 5 Jun 2017 08:57:21 +0800

> We must free allocated skb when genlmsg_put() return fails.
>
> Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
> Signed-off-by: Haishuang Yan <[email protected]>
>
> ---
> Changes in v2:
> - Fix same issue in headers_fill.

Applied, thank you.