From nobody@FreeBSD.org  Wed Apr 14 13:48:49 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9283416A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 14 Apr 2004 13:48:49 -0700 (PDT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E8B443D48
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 14 Apr 2004 13:48:49 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.10/8.12.10) with ESMTP id i3EKmn72026457
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 14 Apr 2004 13:48:49 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.10/8.12.10/Submit) id i3EKmmJg026456;
	Wed, 14 Apr 2004 13:48:49 -0700 (PDT)
	(envelope-from nobody)
Message-Id: <200404142048.i3EKmmJg026456@www.freebsd.org>
Date: Wed, 14 Apr 2004 13:48:49 -0700 (PDT)
From: Stephan Uphoff <ups@tree.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: misplaced bracket in m_getcl (subr_mbuf.c)
X-Send-Pr-Version: www-2.3

>Number:         65548
>Category:       kern
>Synopsis:       misplaced bracket in m_getcl (subr_mbuf.c)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rwatson
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 14 13:50:15 PDT 2004
>Closed-Date:    Sun May 02 15:30:44 PDT 2004
>Last-Modified:  Sun May 02 15:30:44 PDT 2004
>Originator:     Stephan Uphoff
>Release:        current
>Organization:
>Environment:
N/A
>Description:
misplaced bracket in m_getcl

	if (mb->m_ext.ext_buf == NULL) {
		(void)m_free(mb);
		mb = NULL;
	} else {
		_mcl_setup(mb);
		_mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]);
	}
#ifdef MAC
	if (flags & M_PKTHDR) {
		if (mac_init_mbuf(mb, MBTOM(how)) != 0) {
			m_free(mb);
			return (NULL);
		}
	}
#endif


should be


	if (mb->m_ext.ext_buf == NULL) {
		(void)m_free(mb);
		mb = NULL;
	} else {
		_mcl_setup(mb);
		_mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]);
	
#ifdef MAC
		if (flags & M_PKTHDR) {
			if (mac_init_mbuf(mb, MBTOM(how)) != 0) {
				m_free(mb);
				return (NULL);
			}
		}
#endif
       }
>How-To-Repeat:
      
>Fix:
      
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->rwatson 
Responsible-Changed-By: kris 
Responsible-Changed-When: Fri Apr 16 01:50:29 PDT 2004 
Responsible-Changed-Why:  
Looks like fallout from the MAC integration 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65548 
State-Changed-From-To: open->patched 
State-Changed-By: rwatson 
State-Changed-When: Fri Apr 16 07:35:20 PDT 2004 
State-Changed-Why:  
I've applied the change and will wait a few weeks before closing the PR 
to make sure there aren't additional problems. 

Thanks! 


http://www.freebsd.org/cgi/query-pr.cgi?pr=65548 
State-Changed-From-To: patched->closed 
State-Changed-By: rwatson 
State-Changed-When: Sun May 2 15:30:20 PDT 2004 
State-Changed-Why:  
Since there are no further reported problems, close this PR.  Thanks 
for the bug report and fix! 


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