From owner-svn-src-head@FreeBSD.ORG  Sat Aug 24 21:25:54 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 05EC2C8E;
 Sat, 24 Aug 2013 21:25:54 +0000 (UTC)
 (envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E767A248A;
 Sat, 24 Aug 2013 21:25:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7OLPrPK079512;
 Sat, 24 Aug 2013 21:25:53 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7OLPrfC079511;
 Sat, 24 Aug 2013 21:25:53 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201308242125.r7OLPrfC079511@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Sat, 24 Aug 2013 21:25:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r254814 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Aug 2013 21:25:54 -0000

Author: andre
Date: Sat Aug 24 21:25:53 2013
New Revision: 254814
URL: http://svnweb.freebsd.org/changeset/base/254814

Log:
  After r254779 "error" must always be present in mb_ctor_pack(),
  not only when MAC is defined.
  
  Reported by:	gjb / tinderbox
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/kern/kern_mbuf.c

Modified: head/sys/kern/kern_mbuf.c
==============================================================================
--- head/sys/kern/kern_mbuf.c	Sat Aug 24 21:13:38 2013	(r254813)
+++ head/sys/kern/kern_mbuf.c	Sat Aug 24 21:25:53 2013	(r254814)
@@ -619,10 +619,7 @@ mb_ctor_pack(void *mem, int size, void *
 {
 	struct mbuf *m;
 	struct mb_args *args;
-#ifdef MAC
-	int error;
-#endif
-	int flags;
+	int error, flags;
 	short type;
 
 	m = (struct mbuf *)mem;