[PATCH 2/2] Segmentation fault in xfsdump/xfsrestore

[Kouta Ooizumi <k-ooizumi@xxxxxxxxxxxxxx>]

Hi!

xfsdump/xfsrestore causes segmentation fault when "-O options_file" 
is specified twice. Because mlog_fp is used before initialization.

# xfsdump -L session -M label -O optfile -O optfile -f dump / 

This patch adds a new function, mlog_init0(). And it initializes 
three variables(mlog_fp, mlog_level_ss and mlog_qlockh). 
mlog_level_ss is initialized with MLOG_VERBOSE for the log output.


Please patch "[PATCH 1/2] Fix the output message of xfsdump/xfsrestore"
first.


Signed-off-by: Kouta Ooizumi <k-ooizumi@xxxxxxxxxxxxxx>


diff -up xfsdump-2.2.42-orig/common/main.c xfsdump-2.2.42/common/main.c
--- xfsdump-2.2.42-orig/common/main.c   2006-11-17 14:17:38.000000000 +0900
+++ xfsdump-2.2.42/common/main.c        2006-11-30 15:26:22.000000000 +0900
@@ -199,6 +199,10 @@ main( int argc, char *argv[] )
        rval = atexit(mlog_exit_flush);
        assert(rval == 0);
 
+       /* initialize message logging (stage 0)
+        */
+       mlog_init0();
+
        /* pre-scan the command line for the option file option.
         * if found, create a new argv.
         */
diff -up xfsdump-2.2.42-orig/common/mlog.c xfsdump-2.2.42/common/mlog.c
--- xfsdump-2.2.42-orig/common/mlog.c   2006-11-17 14:17:38.000000000 +0900
+++ xfsdump-2.2.42/common/mlog.c        2006-12-01 17:35:04.589000364 +0900
@@ -118,6 +118,25 @@ static int mlog_main_exit_code = -1;
 static rv_t mlog_main_exit_return = RV_NONE;
 static rv_t mlog_main_exit_hint = RV_NONE;
 
+void
+mlog_init0( void )
+{
+       int i;
+
+#ifdef DUMP
+       mlog_fp = stderr;
+#endif /* DUMP */
+#ifdef RESTORE
+       mlog_fp = stdout;
+#endif /* RESTORE */
+
+       for( i = 0 ; i < MLOG_SS_CNT ; i++ ) {
+               mlog_level_ss[ i ] = MLOG_VERBOSE;
+       }
+
+       mlog_qlockh = QLOCKH_NULL;
+}
+
 bool_t
 mlog_init1( intgen_t argc, char *argv[ ] )
 {
@@ -127,13 +146,6 @@ mlog_init1( intgen_t argc, char *argv[ ]
        size_t vsymcnt;
        intgen_t c;
 
-#ifdef DUMP
-        mlog_fp = stderr;
-#endif /* DUMP */
-#ifdef RESTORE
-        mlog_fp = stdout;
-#endif /* RESTORE */
-
        /* initialize stream count. will be updated later by call to
         * mlog_tell_streamcnt( ), after drive layer has counted drives
         */
@@ -288,8 +300,6 @@ mlog_init1( intgen_t argc, char *argv[ ]
        }
 #endif /* DUMP */
 
-       mlog_qlockh = QLOCKH_NULL;
-
        return BOOL_TRUE;
 }
 
diff -up xfsdump-2.2.42-orig/common/mlog.h xfsdump-2.2.42/common/mlog.h
--- xfsdump-2.2.42-orig/common/mlog.h   2006-11-17 14:17:38.000000000 +0900
+++ xfsdump-2.2.42/common/mlog.h        2006-11-30 16:16:20.000000000 +0900
@@ -95,6 +95,7 @@ extern char *mlog_ss_names[ MLOG_SS_CNT 
 /* initializes the mlog abstraction. split into two phases to
  * unravel some initialization sequencing problems.
  */
+extern void mlog_init0( void );
 extern bool_t mlog_init1( intgen_t argc, char *argv[ ] );
 extern bool_t mlog_init2( void );
 
diff -up xfsdump-2.2.42-orig/common/qlock.c xfsdump-2.2.42/common/qlock.c
--- xfsdump-2.2.42-orig/common/qlock.c  2006-11-17 14:17:38.000000000 +0900
+++ xfsdump-2.2.42/common/qlock.c       2006-12-01 19:07:50.488832864 +0900
@@ -263,6 +263,8 @@ qlock_alloc( ix_t ord )
 void
 qlock_lock( qlockh_t qlockh )
 {
+       extern bool_t miniroot;
+
 #ifdef HIDDEN
        qlock_t *qlockp = ( qlock_t * )qlockh;
        pid_t pid;
@@ -271,10 +273,10 @@ qlock_lock( qlockh_t qlockh )
        /* REFERENCED */
        bool_t lockacquired;
 #endif
-       
-       /* sanity checks
-        */
-       ASSERT( qlock_inited );
+
+       if ( ! qlock_inited ) {
+               qlock_init( miniroot );
+       }
 
        /* bypass if miniroot
         */