From owner-svn-src-stable-other@FreeBSD.ORG Mon Jan 4 01:15:39 2010 Return-Path: Delivered-To: svn-src-stable-other@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CAB871065679; Mon, 4 Jan 2010 01:15:39 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B98218FC17; Mon, 4 Jan 2010 01:15:39 +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 o041Fdam006629; Mon, 4 Jan 2010 01:15:39 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o041FdJW006627; Mon, 4 Jan 2010 01:15:39 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201001040115.o041FdJW006627@svn.freebsd.org> From: Xin LI Date: Mon, 4 Jan 2010 01:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org X-SVN-Group: stable-other MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201464 - stable/5/lib/libexpat X-BeenThere: svn-src-stable-other@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the old stable src trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2010 01:15:39 -0000 Author: delphij Date: Mon Jan 4 01:15:39 2010 New Revision: 201464 URL: http://svn.freebsd.org/changeset/base/201464 Log: MFC r201137 Grammar fix. Submitted by: Kenyon Ralph Modified: stable/5/lib/libexpat/libbsdxml.3 Directory Properties: stable/5/lib/libexpat/ (props changed) Modified: stable/5/lib/libexpat/libbsdxml.3 ============================================================================== --- stable/5/lib/libexpat/libbsdxml.3 Mon Jan 4 01:14:21 2010 (r201463) +++ stable/5/lib/libexpat/libbsdxml.3 Mon Jan 4 01:15:39 2010 (r201464) @@ -40,7 +40,7 @@ library is a verbatim copy of the eXpat .Pp The .Nm -library is intended to use within the +library is intended to be used within the .Fx base system only. Use of the From owner-svn-src-stable-other@FreeBSD.ORG Thu Jan 7 01:57:13 2010 Return-Path: Delivered-To: svn-src-stable-other@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B6CD1065670; Thu, 7 Jan 2010 01:57:13 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 79AD08FC12; Thu, 7 Jan 2010 01:57:13 +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 o071vDD8007077; Thu, 7 Jan 2010 01:57:13 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o071vDd6007075; Thu, 7 Jan 2010 01:57:13 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201001070157.o071vDd6007075@svn.freebsd.org> From: Xin LI Date: Thu, 7 Jan 2010 01:57:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-other@freebsd.org X-SVN-Group: stable-other MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201713 - stable/5/sbin/fsck_ffs X-BeenThere: svn-src-stable-other@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the old stable src trees List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2010 01:57:13 -0000 Author: delphij Date: Thu Jan 7 01:57:13 2010 New Revision: 201713 URL: http://svn.freebsd.org/changeset/base/201713 Log: MFC r176575: In pass1(), cap inosused to fs_ipg rather than allowing arbitrary number read from cylinder group. Chances that we read a smarshed cylinder group, and we can not 100% trust information it has supplied. fsck_ffs(8) will crash otherwise for some cases. PR: bin/138043 Reminded by: mckusick Modified: stable/5/sbin/fsck_ffs/pass1.c Directory Properties: stable/5/sbin/fsck_ffs/ (props changed) Modified: stable/5/sbin/fsck_ffs/pass1.c ============================================================================== --- stable/5/sbin/fsck_ffs/pass1.c Thu Jan 7 01:56:35 2010 (r201712) +++ stable/5/sbin/fsck_ffs/pass1.c Thu Jan 7 01:57:13 2010 (r201713) @@ -93,9 +93,11 @@ pass1(void) inumber = c * sblock.fs_ipg; setinodebuf(inumber); getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); - if (sblock.fs_magic == FS_UFS2_MAGIC) + if (sblock.fs_magic == FS_UFS2_MAGIC) { inosused = cgrp.cg_initediblk; - else + if (inosused > sblock.fs_ipg) + inosused = sblock.fs_ipg; + } else inosused = sblock.fs_ipg; if (got_siginfo) { printf("%s: phase 1: cyl group %d of %d (%d%%)\n",