From owner-svn-src-head@FreeBSD.ORG  Thu Jan 26 11:59:48 2012
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 C83B2106564A;
	Thu, 26 Jan 2012 11:59:48 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B32C08FC08;
	Thu, 26 Jan 2012 11:59:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0QBxmui086164;
	Thu, 26 Jan 2012 11:59:48 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0QBxma2086162;
	Thu, 26 Jan 2012 11:59:48 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201201261159.q0QBxma2086162@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 26 Jan 2012 11:59:48 +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: r230583 - 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, 26 Jan 2012 11:59:48 -0000

Author: glebius
Date: Thu Jan 26 11:59:48 2012
New Revision: 230583
URL: http://svn.freebsd.org/changeset/base/230583

Log:
  Although aio_nbytes is size_t, later is is signed to
  casted types: to ssize_t in filesystem code and to
  int in buf code, thus supplying a negative argument
  leads to kernel panic later. To fix that check user
  supplied argument in the beginning of syscall.
  
  Submitted by:	Maxim Dounin <mdounin mdounin.ru>, maxim@

Modified:
  head/sys/kern/vfs_aio.c

Modified: head/sys/kern/vfs_aio.c
==============================================================================
--- head/sys/kern/vfs_aio.c	Thu Jan 26 11:15:12 2012	(r230582)
+++ head/sys/kern/vfs_aio.c	Thu Jan 26 11:59:48 2012	(r230583)
@@ -1552,6 +1552,12 @@ aio_aqueue(struct thread *td, struct aio
 		return (error);
 	}
 
+	/* XXX: aio_nbytes is later casted to signed types. */
+	if ((int)aiocbe->uaiocb.aio_nbytes < 0) {
+		uma_zfree(aiocb_zone, aiocbe);
+		return (EINVAL);
+	}
+
 	if (aiocbe->uaiocb.aio_sigevent.sigev_notify != SIGEV_KEVENT &&
 	    aiocbe->uaiocb.aio_sigevent.sigev_notify != SIGEV_SIGNAL &&
 	    aiocbe->uaiocb.aio_sigevent.sigev_notify != SIGEV_THREAD_ID &&