libext2fs: fix crash when ext2fs_mmp_stop() is called before MMP is initialized

[tools/e2fsprogs.git] / lib / ext2fs / read_bb_file.c

diff --git a/lib/ext2fs/read_bb_file.c b/lib/ext2fs/read_bb_file.c
index 32a8083..a6d3beb 100644 (file)
--- a/lib/ext2fs/read_bb_file.c
+++ b/lib/ext2fs/read_bb_file.c
@@ -1,42 +1,50 @@
 /*
- * read_bb_file.c --- read a list of bad blocks for a FILE *
+ * read_bb_file.c --- read a list of bad blocks from a FILE *
  *
- * Copyright (C) 1994, 1995 Theodore Ts'o.
+ * Copyright (C) 1994, 1995, 2000 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include <stdlib.h>
 #include <fcntl.h>
 #include <time.h>
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#if HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
 #include "ext2fs.h"
 
 /*
  * Reads a list of bad blocks from  a FILE *
  */
-errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f, 
-                             ext2_badblocks_list *bb_list,
-                             void (*invalid)(ext2_filsys fs, blk_t blk))
+errcode_t ext2fs_read_bb_FILE2(ext2_filsys fs, FILE *f,
+                              ext2_badblocks_list *bb_list,
+                              void *priv_data,
+                              void (*invalid)(ext2_filsys fs,
+                                              blk_t blk,
+                                              char *badstr,
+                                              void *priv_data))
 {
        errcode_t       retval;
-       blk_t           blockno;
+       unsigned long long blockno;
        int             count;
        char            buf[128];
 
-       EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+       if (fs)
+               EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
        if (!*bb_list) {
                retval = ext2fs_badblocks_list_create(bb_list, 10);
@@ -47,20 +55,55 @@ errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f,
        while (!feof (f)) {
                if (fgets(buf, sizeof(buf), f) == NULL)
                        break;
-               count = sscanf(buf, "%u", &blockno);
+               count = sscanf(buf, "%llu", &blockno);
                if (count <= 0)
                        continue;
-               if ((blockno < fs->super->s_first_data_block) ||
-                   (blockno >= fs->super->s_blocks_count)) {
+               /* Badblocks isn't going to be updated for 64bit */
+               if (blockno >> 32)
+                       return EOVERFLOW;
+               if (fs &&
+                   ((blockno < fs->super->s_first_data_block) ||
+                    (blockno >= ext2fs_blocks_count(fs->super)))) {
                        if (invalid)
-                               (invalid)(fs, blockno);
+                               (invalid)(fs, (blk64_t) blockno, buf, priv_data);
                        continue;
                }
-               retval = ext2fs_badblocks_list_add(*bb_list, blockno);
+               retval = ext2fs_badblocks_list_add(*bb_list, (blk64_t) blockno);
                if (retval)
                        return retval;
        }
        return 0;
 }
 
+struct compat_struct {
+       void (*invalid)(ext2_filsys, blk_t);
+};
+
+static void call_compat_invalid(ext2_filsys fs, blk_t blk,
+                               char *badstr EXT2FS_ATTR((unused)),
+                               void *priv_data)
+{
+       struct compat_struct *st;
+
+       st = (struct compat_struct *) priv_data;
+       if (st->invalid)
+               (st->invalid)(fs, blk);
+}
+
+
+/*
+ * Reads a list of bad blocks from  a FILE *
+ */
+errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f,
+                             ext2_badblocks_list *bb_list,
+                             void (*invalid)(ext2_filsys fs, blk_t blk))
+{
+       struct compat_struct st;
+
+       st.invalid = invalid;
+
+       return ext2fs_read_bb_FILE2(fs, f, bb_list, &st,
+                                   call_compat_invalid);
+}
+