From owner-freebsd-fs@FreeBSD.ORG  Thu Jan  7 02:00:16 2010
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACA191065679
	for <freebsd-fs@hub.freebsd.org>; Thu,  7 Jan 2010 02:00:16 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 82A2C8FC1B
	for <freebsd-fs@hub.freebsd.org>; Thu,  7 Jan 2010 02:00:16 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0720Gaw046839
	for <freebsd-fs@freefall.freebsd.org>; Thu, 7 Jan 2010 02:00:16 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0720GmS046833;
	Thu, 7 Jan 2010 02:00:16 GMT (envelope-from gnats)
Date: Thu, 7 Jan 2010 02:00:16 GMT
Message-Id: <201001070200.o0720GmS046833@freefall.freebsd.org>
To: freebsd-fs@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: bin/138043: commit references a PR
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jan 2010 02:00:16 -0000

The following reply was made to PR bin/138043; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/138043: commit references a PR
Date: Thu,  7 Jan 2010 01:57:22 +0000 (UTC)

 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",
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"