From owner-freebsd-bugs@FreeBSD.ORG Mon Aug 31 10:00:17 2009 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A2D7510656B7 for ; Mon, 31 Aug 2009 10:00:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 61EB38FC31 for ; Mon, 31 Aug 2009 10:00:16 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VA0Gqr098498 for ; Mon, 31 Aug 2009 10:00:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n7VA0GTl098492; Mon, 31 Aug 2009 10:00:16 GMT (envelope-from gnats) Resent-Date: Mon, 31 Aug 2009 10:00:16 GMT Resent-Message-Id: <200908311000.n7VA0GTl098492@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Patroklos Argyroudis Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D3EC41065676 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/138378: Memory leak in hfsc_class_modify() in file sys/contrib/altq/altq/altq_hfsc.c X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 31 Aug 2009 10:00:17 -0000 >Number: 138378 >Category: kern >Synopsis: Memory leak in hfsc_class_modify() in file sys/contrib/altq/altq/altq_hfsc.c >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Aug 31 10:00:16 UTC 2009 >Closed-Date: >Last-Modified: >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: >Unformatted: