3 files changed, 9 insertions, 11 deletions

diff --git a/modutils/insmod.c b/modutils/insmod.c
index d928be27d..df6bf10a0 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -2201,7 +2201,7 @@ static struct obj_section *obj_create_alloced_section(struct obj_file *f,
         int newidx = f->header.e_shnum++;
         struct obj_section *sec;
 
-        f->sections = xrealloc(f->sections, (newidx + 1) * sizeof(sec));
+        f->sections = xrealloc_vector(f->sections, 2, newidx);
         f->sections[newidx] = sec = arch_new_section();
 
         sec->header.sh_type = SHT_PROGBITS;
@@ -2250,7 +2250,8 @@ static void *obj_extend_section(struct obj_section *sec, unsigned long more)
 {
         unsigned long oldsize = sec->header.sh_size;
         if (more) {
-                sec->contents = xrealloc(sec->contents, sec->header.sh_size += more);
+                sec->header.sh_size += more;
+                sec->contents = xrealloc(sec->contents, sec->header.sh_size);
         }
         return sec->contents + oldsize;
 }
@@ -2736,7 +2737,8 @@ static void new_get_kernel_symbols(void)
  retry_kern_sym_load:
         if (query_module(NULL, QM_SYMBOLS, syms, bufsize, &ret)) {
                 if (errno == ENOSPC && bufsize < ret) {
-                        syms = xrealloc(syms, bufsize = ret);
+                        bufsize = ret;
+                        syms = xrealloc(syms, bufsize);
                         goto retry_kern_sym_load;
                 }
                 bb_perror_msg_and_die("kernel: QM_SYMBOLS");
@@ -3080,7 +3082,7 @@ static void obj_allocate_commons(struct obj_file *f)
                 if (i == f->header.e_shnum) {
                         struct obj_section *sec;
 
-                        f->sections = xrealloc(f->sections, (i + 1) * sizeof(sec));
+                        f->sections = xrealloc(f->sections, 2, i);
                         f->sections[i] = sec = arch_new_section();
                         f->header.e_shnum = i + 1;
 
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index e82ee4cef..4f073536a 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -317,9 +317,7 @@ static FAST_FUNC int fileAction(const char *pathname,
         }
 
         cur = module_count++;
-        if (!(cur & 0xfff)) {
-                modinfo = xrealloc(modinfo, sizeof(modinfo[0]) * (cur + 0x1001));
-        }
+        modinfo = xrealloc_vector(modinfo, 12, cur);
         modinfo[cur].pathname = xstrdup(pathname);
         modinfo[cur].desc = NULL;
         modinfo[cur+1].pathname = NULL;
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 3ac5a81a5..1a4f5d4d4 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -482,10 +482,8 @@ static struct dep_t *build_dep(void)
                                 dep = xstrndup(deps, next - deps - ext + 1);
 
                                 /* Add the new dependable module name */
-                                current->m_depcnt++;
-                                current->m_deparr = xrealloc(current->m_deparr,
-                                                sizeof(char *) * current->m_depcnt);
-                                current->m_deparr[current->m_depcnt - 1] = dep;
+                                current->m_deparr = xrealloc_vector(current->m_deparr, 2, current->m_depcnt);
+                                current->m_deparr[current->m_depcnt++] = dep;
 
                                 p = next + 2;
                         } while (next < end);