Fix UBSan when shifting (1LL << 63)

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

diff --git a/lib/ext2fs/brel_ma.c b/lib/ext2fs/brel_ma.c
index 8ad8e9f..a12afae 100644 (file)
--- a/lib/ext2fs/brel_ma.c
+++ b/lib/ext2fs/brel_ma.c
@@ -1,17 +1,18 @@
 /*
  * brel_ma.c
- * 
+ *
  * Copyright (C) 1996, 1997 Theodore Ts'o.
  *
  * TODO: rewrite to not use a direct array!!!  (Fortunately this
  * module isn't really used yet.)
  *
  * %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 <fcntl.h>
 #include <stdio.h>
 #include <string.h>
@@ -26,24 +27,24 @@
 #include "ext2fs.h"
 #include "brel.h"
 
-static errcode_t bma_put(ext2_brel brel, blk_t old,
+static errcode_t bma_put(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent);
-static errcode_t bma_get(ext2_brel brel, blk_t old,
+static errcode_t bma_get(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent);
 static errcode_t bma_start_iter(ext2_brel brel);
-static errcode_t bma_next(ext2_brel brel, blk_t *old,
+static errcode_t bma_next(ext2_brel brel, blk64_t *old,
                         struct ext2_block_relocate_entry *ent);
-static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new);
-static errcode_t bma_delete(ext2_brel brel, blk_t old);
+static errcode_t bma_move(ext2_brel brel, blk64_t old, blk64_t new);
+static errcode_t bma_delete(ext2_brel brel, blk64_t old);
 static errcode_t bma_free(ext2_brel brel);
 
 struct brel_ma {
        __u32 magic;
-       blk_t max_block;
+       blk64_t max_block;
        struct ext2_block_relocate_entry *entries;
 };
 
-errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
+errcode_t ext2fs_brel_memarray_create(char *name, blk64_t max_block,
                                      ext2_brel *new_brel)
 {
        ext2_brel               brel = 0;
@@ -57,25 +58,26 @@ errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
         * Allocate memory structures
         */
        retval = ext2fs_get_mem(sizeof(struct ext2_block_relocation_table),
-                               (void **) &brel);
+                               &brel);
        if (retval)
                goto errout;
        memset(brel, 0, sizeof(struct ext2_block_relocation_table));
-       
-       retval = ext2fs_get_mem(strlen(name)+1, (void **) &brel->name);
+
+       retval = ext2fs_get_mem(strlen(name)+1, &brel->name);
        if (retval)
                goto errout;
        strcpy(brel->name, name);
-       
-       retval = ext2fs_get_mem(sizeof(struct brel_ma), (void **) &ma);
+
+       retval = ext2fs_get_mem(sizeof(struct brel_ma), &ma);
        if (retval)
                goto errout;
        memset(ma, 0, sizeof(struct brel_ma));
        brel->priv_data = ma;
-       
+
        size = (size_t) (sizeof(struct ext2_block_relocate_entry) *
                         (max_block+1));
-       retval = ext2fs_get_mem(size, (void **) &ma->entries);
+       retval = ext2fs_get_array(max_block+1,
+               sizeof(struct ext2_block_relocate_entry), &ma->entries);
        if (retval)
                goto errout;
        memset(ma->entries, 0, size);
@@ -91,7 +93,7 @@ errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
        brel->move = bma_move;
        brel->delete = bma_delete;
        brel->free = bma_free;
-       
+
        *new_brel = brel;
        return 0;
 
@@ -100,7 +102,7 @@ errout:
        return retval;
 }
 
-static errcode_t bma_put(ext2_brel brel, blk_t old,
+static errcode_t bma_put(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent)
 {
        struct brel_ma  *ma;
@@ -112,7 +114,7 @@ static errcode_t bma_put(ext2_brel brel, blk_t old,
        return 0;
 }
 
-static errcode_t bma_get(ext2_brel brel, blk_t old,
+static errcode_t bma_get(ext2_brel brel, blk64_t old,
                        struct ext2_block_relocate_entry *ent)
 {
        struct brel_ma  *ma;
@@ -132,7 +134,7 @@ static errcode_t bma_start_iter(ext2_brel brel)
        return 0;
 }
 
-static errcode_t bma_next(ext2_brel brel, blk_t *old,
+static errcode_t bma_next(ext2_brel brel, blk64_t *old,
                          struct ext2_block_relocate_entry *ent)
 {
        struct brel_ma  *ma;
@@ -149,7 +151,7 @@ static errcode_t bma_next(ext2_brel brel, blk_t *old,
        return 0;
 }
 
-static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new)
+static errcode_t bma_move(ext2_brel brel, blk64_t old, blk64_t new)
 {
        struct brel_ma  *ma;
 
@@ -163,7 +165,7 @@ static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new)
        return 0;
 }
 
-static errcode_t bma_delete(ext2_brel brel, blk_t old)
+static errcode_t bma_delete(ext2_brel brel, blk64_t old)
 {
        struct brel_ma  *ma;
 
@@ -187,11 +189,11 @@ static errcode_t bma_free(ext2_brel brel)
 
        if (ma) {
                if (ma->entries)
-                       ext2fs_free_mem((void **) &ma->entries);
-               ext2fs_free_mem((void **) &ma);
+                       ext2fs_free_mem(&ma->entries);
+               ext2fs_free_mem(&ma);
        }
        if (brel->name)
-               ext2fs_free_mem((void **) &brel->name);
-       ext2fs_free_mem((void **) &brel);
+               ext2fs_free_mem(&brel->name);
+       ext2fs_free_mem(&brel);
        return 0;
 }