From owner-svn-src-head@FreeBSD.ORG  Sat Mar 14 20:40:06 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B25AF1065675;
	Sat, 14 Mar 2009 20:40:06 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A15968FC1A;
	Sat, 14 Mar 2009 20:40:06 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2EKe6D0007628;
	Sat, 14 Mar 2009 20:40:06 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2EKe60h007627;
	Sat, 14 Mar 2009 20:40:06 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <200903142040.n2EKe60h007627@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 14 Mar 2009 20:40:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189830 - head/sys/security/mac_portacl
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 14 Mar 2009 20:40:07 -0000

Author: pjd
Date: Sat Mar 14 20:40:06 2009
New Revision: 189830
URL: http://svn.freebsd.org/changeset/base/189830

Log:
  - Correct logic in if statement - we want to allocate temporary buffer
    when someone is passing new rules, not when he only want to read them.
    Because of this bug, even if the given rules were incorrect, they
    ended up in rule_string.
  - Add missing protection for rule_string when coping it.
  
  Reviewed by:	rwatson
  MFC after:	1 week

Modified:
  head/sys/security/mac_portacl/mac_portacl.c

Modified: head/sys/security/mac_portacl/mac_portacl.c
==============================================================================
--- head/sys/security/mac_portacl/mac_portacl.c	Sat Mar 14 20:16:54 2009	(r189829)
+++ head/sys/security/mac_portacl/mac_portacl.c	Sat Mar 14 20:40:06 2009	(r189830)
@@ -341,10 +341,12 @@ sysctl_rules(SYSCTL_HANDLER_ARGS)
 	int error;
 
 	new_string = NULL;
-	if (req->newptr == NULL) {
+	if (req->newptr != NULL) {
 		new_string = malloc(MAC_RULE_STRING_LEN, M_PORTACL,
 		    M_WAITOK | M_ZERO);
+		mtx_lock(&rule_mtx);
 		strcpy(new_string, rule_string);
+		mtx_unlock(&rule_mtx);
 		string = new_string;
 	} else
 		string = rule_string;