From owner-svn-src-head@FreeBSD.ORG  Thu Jul  2 09:16:25 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 66DB01065675;
	Thu,  2 Jul 2009 09:16:25 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 55BE48FC08;
	Thu,  2 Jul 2009 09:16:25 +0000 (UTC)
	(envelope-from rwatson@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 n629GPrt038973;
	Thu, 2 Jul 2009 09:16:25 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n629GPJB038971;
	Thu, 2 Jul 2009 09:16:25 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200907020916.n629GPJB038971@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 2 Jul 2009 09:16:25 +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: r195281 - head/sys/kern
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: Thu, 02 Jul 2009 09:16:25 -0000

Author: rwatson
Date: Thu Jul  2 09:16:25 2009
New Revision: 195281
URL: http://svn.freebsd.org/changeset/base/195281

Log:
  Audit file descriptor and command arguments to ioctl(2).
  
  Approved by:	re (audit argument blanket)
  MFC after:	1 week

Modified:
  head/sys/kern/sys_generic.c

Modified: head/sys/kern/sys_generic.c
==============================================================================
--- head/sys/kern/sys_generic.c	Thu Jul  2 09:15:30 2009	(r195280)
+++ head/sys/kern/sys_generic.c	Thu Jul  2 09:16:25 2009	(r195281)
@@ -693,6 +693,8 @@ kern_ioctl(struct thread *td, int fd, u_
 	int error;
 	int tmp;
 
+	AUDIT_ARG_FD(fd);
+	AUDIT_ARG_CMD(com);
 	if ((error = fget(td, fd, &fp)) != 0)
 		return (error);
 	if ((fp->f_flag & (FREAD | FWRITE)) == 0) {