From owner-svn-src-all@FreeBSD.ORG Wed Aug 15 12:01:14 2012 Return-Path: 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 6F8D8106566B; Wed, 15 Aug 2012 12:01:14 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A57A8FC0C; Wed, 15 Aug 2012 12:01:14 +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 q7FC1EI3050977; Wed, 15 Aug 2012 12:01:14 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7FC1Ewm050975; Wed, 15 Aug 2012 12:01:14 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201208151201.q7FC1Ewm050975@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Wed, 15 Aug 2012 12:01:14 +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: r239294 - head/sys/boot/common 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2012 12:01:14 -0000 Author: ae Date: Wed Aug 15 12:01:13 2012 New Revision: 239294 URL: http://svn.freebsd.org/changeset/base/239294 Log: Some BIOSes return incorrect number of sectors, make checks less strictly, to do not lost some partitions. Reported by: swills@ Modified: head/sys/boot/common/part.c Modified: head/sys/boot/common/part.c ============================================================================== --- head/sys/boot/common/part.c Wed Aug 15 10:11:29 2012 (r239293) +++ head/sys/boot/common/part.c Wed Aug 15 12:01:13 2012 (r239294) @@ -372,8 +372,10 @@ ptable_ebrread(struct ptable *table, voi if (buf == NULL) return (table); for (i = 0; i < MAXEBRENTRIES; i++) { +#if 0 if (offset >= table->sectors) break; +#endif if (dread(dev, buf, 1, offset) != 0) break; dp = (struct dos_partition *)(buf + DOSPARTOFF); @@ -663,8 +665,10 @@ ptable_open(void *dev, off_t sectors, ui end = le32toh(dp[i].dp_size); if (start == 0 || end == 0) continue; +#if 0 if (start + end - 1 >= sectors) continue; /* XXX: ignore */ +#endif if (dp[i].dp_typ == DOSPTYP_EXT || dp[i].dp_typ == DOSPTYP_EXTLBA) has_ext = 1;