From nobody@FreeBSD.org  Mon Dec 19 21:23:04 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 32DCE106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Dec 2011 21:23:04 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 1DF378FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Dec 2011 21:23:04 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id pBJLN3LH097035
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 19 Dec 2011 21:23:03 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id pBJLN3T1097034;
	Mon, 19 Dec 2011 21:23:03 GMT
	(envelope-from nobody)
Message-Id: <201112192123.pBJLN3T1097034@red.freebsd.org>
Date: Mon, 19 Dec 2011 21:23:03 GMT
From: Michiel Boland <michiel@boland.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: SU+J fsck uses bogus sector size on sparc64
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         163460
>Category:       bin
>Synopsis:       fsck(8): SU+J fsck uses bogus sector size on sparc64
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    kib
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 19 21:30:11 UTC 2011
>Closed-Date:    Mon Jan 02 00:05:37 UTC 2012
>Last-Modified:  Mon Jan  2 00:10:11 UTC 2012
>Originator:     Michiel Boland
>Release:        FreeBSD 9.0-PRERELEASE sparc64
>Organization:
>Environment:
System: FreeBSD doctorwu 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #0: Mon Dec 19 15:46:47 CET 2011 root@doctorwu:/usr/obj/usr/src/sys/DOCTORWU sparc64

>Description:
When recovering after a crash, fsck, when asked to use the journal, either consumes all memory, or crashes otherwise.

>How-To-Repeat:
Install fresh FreeBSD 9.0 with SU+J (the default)
Power cycle
When fsck asks to use the journal: type Y

>Fix:


Patch attached with submission follows:

--- sbin/fsck_ffs/suj.c.orig	2011-09-23 02:51:37.000000000 +0200
+++ sbin/fsck_ffs/suj.c	2011-12-19 22:06:03.000000000 +0100
@@ -192,6 +192,8 @@
 static void
 opendisk(const char *devnam)
 {
+	u_int s;
+
 	if (disk != NULL)
 		return;
 	disk = malloc(sizeof(*disk));
@@ -202,9 +204,13 @@
 		    disk->d_error);
 	}
 	fs = &disk->d_fs;
-	if (real_dev_bsize == 0 && ioctl(disk->d_fd, DIOCGSECTORSIZE,
-	    &real_dev_bsize) == -1)
-		real_dev_bsize = secsize;
+	if (real_dev_bsize == 0) {
+		s = 0;
+		if (ioctl(disk->d_fd, DIOCGSECTORSIZE, &s) == -1)
+			real_dev_bsize = secsize;
+		else
+			real_dev_bsize = s;
+	}
 	if (debug)
 		printf("dev_bsize %ld\n", real_dev_bsize);
 }


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-sparc64->eadler 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Tue Dec 20 01:44:18 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163460 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163460: commit references a PR
Date: Tue, 20 Dec 2011 20:39:09 +0000 (UTC)

 Author: kib
 Date: Tue Dec 20 20:39:00 2011
 New Revision: 228751
 URL: http://svn.freebsd.org/changeset/base/228751
 
 Log:
   Change the type of real_dev_bsize variable from long to u_int.
   The DIOCGSECTORSIZE takes u_int * as an argument, using long *
   causes failures on big-endian targets.
   
   Diagnosed by:	Michiel Boland <boland37 xs4all nl>
   PR:	sparc64/163460
   Tested by:	pho (x86), flo (sparc64)
   MFC after:	1 week
 
 Modified:
   head/sbin/fsck_ffs/fsck.h
   head/sbin/fsck_ffs/suj.c
 
 Modified: head/sbin/fsck_ffs/fsck.h
 ==============================================================================
 --- head/sbin/fsck_ffs/fsck.h	Tue Dec 20 20:37:17 2011	(r228750)
 +++ head/sbin/fsck_ffs/fsck.h	Tue Dec 20 20:39:00 2011	(r228751)
 @@ -268,7 +268,7 @@ char	snapname[BUFSIZ];	/* when doing sna
  char	*cdevname;		/* name of device being checked */
  long	dev_bsize;		/* computed value of DEV_BSIZE */
  long	secsize;		/* actual disk sector size */
 -long	real_dev_bsize;
 +u_int	real_dev_bsize;		/* actual disk sector size, not overriden */
  char	nflag;			/* assume a no response */
  char	yflag;			/* assume a yes response */
  int	bkgrdflag;		/* use a snapshot to run on an active system */
 
 Modified: head/sbin/fsck_ffs/suj.c
 ==============================================================================
 --- head/sbin/fsck_ffs/suj.c	Tue Dec 20 20:37:17 2011	(r228750)
 +++ head/sbin/fsck_ffs/suj.c	Tue Dec 20 20:39:00 2011	(r228751)
 @@ -206,7 +206,7 @@ opendisk(const char *devnam)
  	    &real_dev_bsize) == -1)
  		real_dev_bsize = secsize;
  	if (debug)
 -		printf("dev_bsize %ld\n", real_dev_bsize);
 +		printf("dev_bsize %u\n", real_dev_bsize);
  }
  
  /*
 _______________________________________________
 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"
 
Responsible-Changed-From-To: eadler->kib 
Responsible-Changed-By: eadler 
Responsible-Changed-When: Wed Dec 21 00:57:53 UTC 2011 
Responsible-Changed-Why:  
over to committer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163460 
State-Changed-From-To: open->closed 
State-Changed-By: kib 
State-Changed-When: Mon Jan 2 00:05:18 UTC 2012 
State-Changed-Why:  
All merged. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=163460 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/163460: commit references a PR
Date: Mon,  2 Jan 2012 00:05:00 +0000 (UTC)

 Author: kib
 Date: Mon Jan  2 00:04:51 2012
 New Revision: 229256
 URL: http://svn.freebsd.org/changeset/base/229256
 
 Log:
   MFC r228751:
   Change the type of real_dev_bsize variable from long to u_int.
   The DIOCGSECTORSIZE takes u_int * as an argument, using long *
   causes failures on big-endian targets.
   
   PR:	sparc64/163460
 
 Modified:
   stable/9/sbin/fsck_ffs/fsck.h
   stable/9/sbin/fsck_ffs/suj.c
 Directory Properties:
   stable/9/sbin/fsck_ffs/   (props changed)
 
 Modified: stable/9/sbin/fsck_ffs/fsck.h
 ==============================================================================
 --- stable/9/sbin/fsck_ffs/fsck.h	Mon Jan  2 00:02:50 2012	(r229255)
 +++ stable/9/sbin/fsck_ffs/fsck.h	Mon Jan  2 00:04:51 2012	(r229256)
 @@ -268,7 +268,7 @@ char	snapname[BUFSIZ];	/* when doing sna
  char	*cdevname;		/* name of device being checked */
  long	dev_bsize;		/* computed value of DEV_BSIZE */
  long	secsize;		/* actual disk sector size */
 -long	real_dev_bsize;
 +u_int	real_dev_bsize;		/* actual disk sector size, not overriden */
  char	nflag;			/* assume a no response */
  char	yflag;			/* assume a yes response */
  int	bkgrdflag;		/* use a snapshot to run on an active system */
 
 Modified: stable/9/sbin/fsck_ffs/suj.c
 ==============================================================================
 --- stable/9/sbin/fsck_ffs/suj.c	Mon Jan  2 00:02:50 2012	(r229255)
 +++ stable/9/sbin/fsck_ffs/suj.c	Mon Jan  2 00:04:51 2012	(r229256)
 @@ -206,7 +206,7 @@ opendisk(const char *devnam)
  	    &real_dev_bsize) == -1)
  		real_dev_bsize = secsize;
  	if (debug)
 -		printf("dev_bsize %ld\n", real_dev_bsize);
 +		printf("dev_bsize %u\n", real_dev_bsize);
  }
  
  /*
 _______________________________________________
 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"
 
>Unformatted:
