diff mbox

[1/1] net:sched fix a bug about memery leak

Message ID 1382605580-2629-1-git-send-email-windsdaemon@gmail.com
State Rejected, archived
Delegated to: David Miller
Headers show

Commit Message

Jing Wang Oct. 24, 2013, 9:06 a.m. UTC
From: Jing Wang <windsdaemon@gmail.com>

the code isn't properly release memory

Signed-off-by: Jing Wang <windsdaemon@gmail.com>
---
 net/sched/cls_route.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

Comments

Sergei Shtylyov Oct. 24, 2013, 2:05 p.m. UTC | #1
Hello.

On 10/24/2013 01:06 PM, Jing Wang wrote:

> From: Jing Wang <windsdaemon@gmail.com>

> the code isn't properly release memory

> Signed-off-by: Jing Wang <windsdaemon@gmail.com>
> ---
>   net/sched/cls_route.c |    9 ++++++---
>   1 files changed, 6 insertions(+), 3 deletions(-)

> diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
> index 37da567..118f8d5 100644
> --- a/net/sched/cls_route.c
> +++ b/net/sched/cls_route.c
[...]
> @@ -517,6 +517,9 @@ reinsert:
>
>   errout:
>   	kfree(f);
> +errflt:
> +    kfree(head);

    Please indent with tab, not spaces.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 37da567..118f8d5 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -466,11 +466,11 @@  static int route4_change(struct net *net, struct sk_buff *in_skb,
 		goto reinsert;
 	}
 
-	err = -ENOBUFS;
+	err = -ENOMEM;
 	if (head == NULL) {
 		head = kzalloc(sizeof(struct route4_head), GFP_KERNEL);
 		if (head == NULL)
-			goto errout;
+			goto errhead;
 
 		tcf_tree_lock(tp);
 		tp->root = head;
@@ -479,7 +479,7 @@  static int route4_change(struct net *net, struct sk_buff *in_skb,
 
 	f = kzalloc(sizeof(struct route4_filter), GFP_KERNEL);
 	if (f == NULL)
-		goto errout;
+		goto errflt;
 
 	err = route4_set_parms(net, tp, base, f, handle, head, tb,
 		tca[TCA_RATE], 1);
@@ -517,6 +517,9 @@  reinsert:
 
 errout:
 	kfree(f);
+errflt:
+    kfree(head);
+errhead:
 	return err;
 }