From owner-p4-projects@FreeBSD.ORG  Wed Jun 28 20:25:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 31CA016A410; Wed, 28 Jun 2006 20:25:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 EA12616A408
	for <perforce@freebsd.org>; Wed, 28 Jun 2006 20:25:36 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B5C07449A2
	for <perforce@freebsd.org>; Wed, 28 Jun 2006 20:25:36 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5SKPaUM049446
	for <perforce@freebsd.org>; Wed, 28 Jun 2006 20:25:36 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SKPa7q049443
	for perforce@freebsd.org; Wed, 28 Jun 2006 20:25:36 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 28 Jun 2006 20:25:36 GMT
Message-Id: <200606282025.k5SKPa7q049443@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100230 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 28 Jun 2006 20:25:37 -0000

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

Change 100230 by jhb@jhb_mutex on 2006/06/28 20:25:17

	Don't copyin a msqid_ds for IPC_RMID.  Neither the base system nor
	ibcs2 do and kern_msgctl() will just ignore it.

Affected files ...

.. //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#15 edit

Differences ...

==== //depot/projects/smpng/sys/compat/svr4/svr4_ipc.c#15 (text+ko) ====

@@ -500,11 +500,7 @@
 		return (kern_msgctl(td, uap->msqid, IPC_SET, &bs));
 
 	case SVR4_IPC_RMID:
-		error = copyin(uap->buf, &ss, sizeof ss);
-		if (error)
-			return error;
-		svr4_to_bsd_msqid_ds(&ss, &bs);
-		return (kern_msgctl(td, uap->msqid, IPC_RMID, &bs));
+		return (kern_msgctl(td, uap->msqid, IPC_RMID, NULL));
 
 	default:
 		return EINVAL;