From owner-cvs-all@FreeBSD.ORG  Sat Nov 13 08:06:41 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9A28E16A4CE; Sat, 13 Nov 2004 08:06:41 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7673C43D46; Sat, 13 Nov 2004 08:06:41 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iAD86fxJ072790;
	Sat, 13 Nov 2004 08:06:41 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iAD86fvV072789;
	Sat, 13 Nov 2004 08:06:41 GMT
	(envelope-from rwatson)
Message-Id: <200411130806.iAD86fvV072789@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 13 Nov 2004 08:06:41 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/kern sysv_sem.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Nov 2004 08:06:41 -0000

rwatson     2004-11-13 08:06:41 UTC

  FreeBSD src repository

  Modified files:
    sys/kern             sysv_sem.c 
  Log:
  Correct two incorrectly merged changes introduced in sysv_sem.c:1.71:
  return EINVAL rather than setting error, and don't free sops
  unconditionally.  The first change was merged accidentally as part of
  the larger set of changes to introduce MAC labels and access control,
  and potentially lead to continued processing of a request even after
  it was determined to be invalid.  The second change was due to changes
  in the semaphore code since the original work was performed.
  
  Pointed out by: truckman
  
  Revision  Changes    Path
  1.72      +1 -2      src/sys/kern/sysv_sem.c