From owner-p4-projects@FreeBSD.ORG  Tue Sep 30 08:32:09 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 514B716A4C4; Tue, 30 Sep 2003 08:32:09 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1457316A4F4
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 08:32:09 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8771043FF3
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 08:32:08 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h8UFW8XJ092305
	for <perforce@freebsd.org>; Tue, 30 Sep 2003 08:32:08 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h8UFW81Z092302
	for perforce@freebsd.org; Tue, 30 Sep 2003 08:32:08 -0700 (PDT)
	(envelope-from areisse@nailabs.com)
Date: Tue, 30 Sep 2003 08:32:08 -0700 (PDT)
Message-Id: <200309301532.h8UFW81Z092302@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	areisse@nailabs.com using -f
From: Andrew Reisse <areisse@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 38889 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Sep 2003 15:32:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=38889

Change 38889 by areisse@areisse_tislabs on 2003/09/30 08:32:04

	properly initialize sidtab structures
	don't divide by zero when empty policy files are loaded 

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/fileutils.c#5 (text+ko) ====

@@ -107,6 +107,9 @@
 size_t
 fread(void *ptr, size_t size, size_t nmemb, FILE *fp)
 {
+	if (size == 0)
+		return 0;
+
 	struct thread *td = curthread;
 
 	fp->FILE_uio.uio_iov->iov_base = ptr;

==== //depot/projects/trustedbsd/sebsd/sys/security/sebsd/ss/sidtab.c#7 (text+ko) ====

@@ -42,6 +42,7 @@
 	s->nel = 0;
 	s->next_sid = 1;
 	s->shutdown = 0;
+	memset (&s->lock, 0, sizeof (struct mtx));
 	INIT_SIDTAB_LOCK(s);
 	return 0;
 }