From owner-freebsd-current@FreeBSD.ORG  Sat Nov 13 08:10:06 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id DF69F16A4CE; Sat, 13 Nov 2004 08:10:06 +0000 (GMT)
Received: from fledge.watson.org (fledge.watson.org [204.156.12.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 56FF643D49; Sat, 13 Nov 2004 08:10:06 +0000 (GMT)
	(envelope-from robert@fledge.watson.org)
Received: from fledge.watson.org (localhost [127.0.0.1])
	by fledge.watson.org (8.13.1/8.13.1) with ESMTP id iAD88mtx039754;
	Sat, 13 Nov 2004 03:08:48 -0500 (EST)
	(envelope-from robert@fledge.watson.org)
Received: from localhost (robert@localhost)iAD88mR5039751;
	Sat, 13 Nov 2004 08:08:48 GMT
	(envelope-from robert@fledge.watson.org)
Date: Sat, 13 Nov 2004 08:08:47 +0000 (GMT)
From: Robert Watson <rwatson@FreeBSD.org>
X-Sender: robert@fledge.watson.org
To: Don Lewis <truckman@FreeBSD.org>
In-Reply-To: <200411122312.iACNBvVv067706@gw.catspoiler.org>
Message-ID: <Pine.NEB.3.96L.1041113080524.26498D-100000@fledge.watson.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: current@FreeBSD.org
Subject: Re: kernel panic in free() called from semop()
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Nov 2004 08:10:07 -0000


Sorry about that, fixes committed!

On Fri, 12 Nov 2004, Don Lewis wrote:

> @@ -900,7 +901,7 @@ semop(td, uap)
>  	semid = IPCID_TO_IX(semid);	/* Convert back to zero origin */
>  
>  	if (semid < 0 || semid >= seminfo.semmni)
> -		return (EINVAL);
> +		error = EINVAL;

This was part of a second set of changes that I haven't yet merged, which
slipped through while I was breaking out the ABI changes.

> @@ -1152,6 +1153,7 @@ done2:
>  	mtx_unlock(sema_mtxp);
>  	if (sops != small_sops)
>  		free(sops, M_SEM);
> +	free(sops, M_SEM);
>  	return (error);
>  }

And this is from incorrectly merging the small_sops change to the
TrustedBSD branch when it was originally committed.

I thought I'd gone through the patches pretty carefully for this sort of
thing, but I guess after reading through three files of the system v IPC
code, the eyes go numb.

Thanks,

Robert N M Watson             FreeBSD Core Team, TrustedBSD Projects
robert@fledge.watson.org      Principal Research Scientist, McAfee Research