From owner-svn-src-all@FreeBSD.ORG  Thu Sep 24 15:34:19 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F81510656A4;
	Thu, 24 Sep 2009 15:34:19 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2E5668FC29;
	Thu, 24 Sep 2009 15:34:19 +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 n8OFYJp5000572;
	Thu, 24 Sep 2009 15:34:19 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8OFYJLN000570;
	Thu, 24 Sep 2009 15:34:19 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200909241534.n8OFYJLN000570@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Thu, 24 Sep 2009 15:34:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197457 - stable/8/lib/libdisk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Sep 2009 15:34:19 -0000

Author: nyan
Date: Thu Sep 24 15:34:18 2009
New Revision: 197457
URL: http://svn.freebsd.org/changeset/base/197457

Log:
  MFC: r197322 and r197374
  
    Revision: 197322
    Log:
      Correct BIOS header sanitizing on pc98.
  
    Revision: 197374
    Log:
      Disable a check on a disk size because it's too strict.  This change is
      to avoid using incorrect geometry.
  
     It seems that this is the same problem in g_part_bsd_read()@g_part_bsd.c.
  
     Reviewed by: rink
  
  Approved by:	re (kib)

Modified:
  stable/8/lib/libdisk/   (props changed)
  stable/8/lib/libdisk/change.c

Modified: stable/8/lib/libdisk/change.c
==============================================================================
--- stable/8/lib/libdisk/change.c	Thu Sep 24 14:30:17 2009	(r197456)
+++ stable/8/lib/libdisk/change.c	Thu Sep 24 15:34:18 2009	(r197457)
@@ -36,17 +36,22 @@ Sanitize_Bios_Geom(struct disk *disk)
 
 	if (disk->bios_cyl >= 65536)
 		sane = 0;
-	if (disk->bios_hd > 256)
-		sane = 0;
 #ifdef PC98
+	if (disk->bios_hd >= 256)
+		sane = 0;
 	if (disk->bios_sect >= 256)
+		sane = 0;
 #else
+	if (disk->bios_hd > 256)
+		sane = 0;
 	if (disk->bios_sect > 63)
-#endif
 		sane = 0;
+#endif
+#if 0	/* Disable a check on a disk size.  It's too strict. */
 	if (disk->bios_cyl * disk->bios_hd * disk->bios_sect !=
 	    disk->chunks->size)
 		sane = 0;
+#endif
 	if (sane)
 		return;