Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1657201 > unrolled thread

[PATCH v2] devlink: fix potential memort leak

Started byHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
First post2017-06-05 03:00 +0200
Last post2017-06-05 17:30 +0200
Articles 3 — 3 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v2] devlink: fix potential memort leak Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-05 03:00 +0200
    Re: [PATCH v2] devlink: fix potential memort leak Jiri Pirko <jiri@resnulli.us> - 2017-06-05 07:00 +0200
    Re: [PATCH v2] devlink: fix potential memort leak David Miller <davem@davemloft.net> - 2017-06-05 17:30 +0200

#1657201 — [PATCH v2] devlink: fix potential memort leak

FromHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date2017-06-05 03:00 +0200
Subject[PATCH v2] devlink: fix potential memort leak
Message-ID<tOOxb-40P-1@gated-at.bofh.it>
We must free allocated skb when genlmsg_put() return fails.

Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>

---
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

[toc] | [next] | [standalone]


#1657268

FromJiri Pirko <jiri@resnulli.us>
Date2017-06-05 07:00 +0200
Message-ID<tOShs-6GX-9@gated-at.bofh.it>
In reply to#1657201
Mon, Jun 05, 2017 at 02:57:21AM CEST, yanhaishuang@cmss.chinamobile.com wrote:
>We must free allocated skb when genlmsg_put() return fails.
>
>Fixes: 1555d204e743 ("devlink: Support for pipeline debug (dpipe)")
>Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>

Acked-by: Jiri Pirko <jiri@mellanox.com>

Thanks.

[toc] | [prev] | [next] | [standalone]


#1657673

FromDavid Miller <davem@davemloft.net>
Date2017-06-05 17:30 +0200
Message-ID<tP279-4D2-25@gated-at.bofh.it>
In reply to#1657201
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
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 <yanhaishuang@cmss.chinamobile.com>
> 
> ---
> Changes in v2:
>   - Fix same issue in headers_fill.

Applied, thank you.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web