From owner-svn-src-stable@FreeBSD.ORG  Tue May  4 00:42:03 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DCE83106564A;
	Tue,  4 May 2010 00:42:03 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id CC2F18FC12;
	Tue,  4 May 2010 00:42:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o440g33t050429;
	Tue, 4 May 2010 00:42:03 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o440g3ZX050427;
	Tue, 4 May 2010 00:42:03 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201005040042.o440g3ZX050427@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 4 May 2010 00:42:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207591 - stable/6/sys/dev/ata
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 May 2010 00:42:04 -0000

Author: delphij
Date: Tue May  4 00:42:03 2010
New Revision: 207591
URL: http://svn.freebsd.org/changeset/base/207591

Log:
  MFC r195724 (mav):
  
  Limit IOCATAREQUEST ioctl data size to controller's maximum I/O size.
  It fixes kernel panic when requested size is too large (0xffffffff),
  
  PR:	kern/136726

Modified:
  stable/6/sys/dev/ata/ata-all.c
Directory Properties:
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/sys/dev/ata/ata-all.c
==============================================================================
--- stable/6/sys/dev/ata/ata-all.c	Mon May  3 22:32:26 2010	(r207590)
+++ stable/6/sys/dev/ata/ata-all.c	Tue May  4 00:42:03 2010	(r207591)
@@ -438,6 +438,7 @@ int
 ata_device_ioctl(device_t dev, u_long cmd, caddr_t data)
 {
     struct ata_device *atadev = device_get_softc(dev);
+    struct ata_channel *ch = device_get_softc(device_get_parent(dev));
     struct ata_ioc_request *ioc_request = (struct ata_ioc_request *)data;
     struct ata_params *params = (struct ata_params *)data;
     int *mode = (int *)data;
@@ -447,6 +448,10 @@ ata_device_ioctl(device_t dev, u_long cm
 
     switch (cmd) {
     case IOCATAREQUEST:
+	if (ioc_request->count >
+	    (ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS)) {
+		return (EFBIG);
+	}
 	if (!(buf = malloc(ioc_request->count, M_ATA, M_NOWAIT))) {
 	    return ENOMEM;
 	}