From nobody@FreeBSD.org  Mon Aug 31 09:58:25 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3EC41065676
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 31 Aug 2009 09:58:25 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id C2DA18FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 31 Aug 2009 09:58:25 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n7V9wPA2051605
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 31 Aug 2009 09:58:25 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n7V9wPfc051604;
	Mon, 31 Aug 2009 09:58:25 GMT
	(envelope-from nobody)
Message-Id: <200908310958.n7V9wPfc051604@www.freebsd.org>
Date: Mon, 31 Aug 2009 09:58:25 GMT
From: Patroklos Argyroudis <argp@census-labs.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Memory leak in hfsc_class_modify() in file sys/contrib/altq/altq/altq_hfsc.c
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         138378
>Category:       kern
>Synopsis:       [altq] [patch] Memory leak in hfsc_class_modify() in file sys/contrib/altq/altq/altq_hfsc.c
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 31 10:00:16 UTC 2009
>Closed-Date:    Tue Nov 17 14:40:41 CET 2009
>Last-Modified:  Tue Nov 17 14:40:41 CET 2009
>Originator:     Patroklos Argyroudis
>Release:        8.0-CURRENT
>Organization:
census, inc
>Environment:
N/A
>Description:
There is a memory leak of pointers rsc_tmp and fsc_tmp if the allocations in lines 1810 and 1817 fail.
>How-To-Repeat:
N/A
>Fix:
Patch attached.

Patch attached with submission follows:

--- ./sys/contrib/altq/altq/altq_hfsc.c.orig	2009-08-27 17:24:01.000000000 +0300
+++ ./sys/contrib/altq/altq/altq_hfsc.c	2009-08-27 17:26:39.000000000 +0300
@@ -1809,15 +1809,20 @@
 	    cl->cl_fsc == NULL) {
 		fsc_tmp = malloc(sizeof(struct internal_sc),
 		    M_DEVBUF, M_WAITOK);
-		if (fsc_tmp == NULL)
+		if (fsc_tmp == NULL) {
+			free(rsc_tmp);
 			return (ENOMEM);
+		}
 	}
 	if (usc != NULL && (usc->m1 != 0 || usc->m2 != 0) &&
 	    cl->cl_usc == NULL) {
 		usc_tmp = malloc(sizeof(struct internal_sc),
 		    M_DEVBUF, M_WAITOK);
-		if (usc_tmp == NULL)
+		if (usc_tmp == NULL) {
+			free(rsc_tmp);
+			free(fsc_tmp);
 			return (ENOMEM);
+		}
 	}
 
 	cur_time = read_machclk();


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-net 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Aug 31 10:32:03 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138378 
State-Changed-From-To: open->patched 
State-Changed-By: brueffer 
State-Changed-When: Thu Nov 5 17:30:26 CET 2009 
State-Changed-Why:  
Committed, thanks! 


Responsible-Changed-From-To: freebsd-net->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Thu Nov 5 17:30:26 CET 2009 
Responsible-Changed-Why:  
MFC reminder. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138378 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/138378: commit references a PR
Date: Thu,  5 Nov 2009 16:30:25 +0000 (UTC)

 Author: brueffer
 Date: Thu Nov  5 16:30:16 2009
 New Revision: 198952
 URL: http://svn.freebsd.org/changeset/base/198952
 
 Log:
   Fix two memory leaks in error cases.
   
   PR:		138378
   Submitted by:	Patroklos Argyroudis <argp@census-labs.com>
   Approved by:	mlaier
   MFC after:	1 week
 
 Modified:
   head/sys/contrib/altq/altq/altq_hfsc.c
 
 Modified: head/sys/contrib/altq/altq/altq_hfsc.c
 ==============================================================================
 --- head/sys/contrib/altq/altq/altq_hfsc.c	Thu Nov  5 16:16:56 2009	(r198951)
 +++ head/sys/contrib/altq/altq/altq_hfsc.c	Thu Nov  5 16:30:16 2009	(r198952)
 @@ -1809,15 +1809,20 @@ hfsc_class_modify(cl, rsc, fsc, usc)
  	    cl->cl_fsc == NULL) {
  		fsc_tmp = malloc(sizeof(struct internal_sc),
  		    M_DEVBUF, M_WAITOK);
 -		if (fsc_tmp == NULL)
 +		if (fsc_tmp == NULL) {
 +			free(rsc_tmp);
  			return (ENOMEM);
 +		}
  	}
  	if (usc != NULL && (usc->m1 != 0 || usc->m2 != 0) &&
  	    cl->cl_usc == NULL) {
  		usc_tmp = malloc(sizeof(struct internal_sc),
  		    M_DEVBUF, M_WAITOK);
 -		if (usc_tmp == NULL)
 +		if (usc_tmp == NULL) {
 +			free(rsc_tmp);
 +			free(fsc_tmp);
  			return (ENOMEM);
 +		}
  	}
  
  	cur_time = read_machclk();
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brueffer 
State-Changed-When: Tue Nov 17 14:40:23 CET 2009 
State-Changed-Why:  
MFCs done. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138378 
>Unformatted:
