aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-03-29 20:26:45 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-03-29 20:26:45 +0000
commit0180abdf4933f1d7536daa0c6139886077af9ee3 (patch)
treeb7d5b52ba5eae7acf14086a8d8147a20eef4d5c3
parent21028447f28c37fbc5436116512dfad74434ec4a (diff)
downloadupstream-0180abdf4933f1d7536daa0c6139886077af9ee3.tar.gz
upstream-0180abdf4933f1d7536daa0c6139886077af9ee3.tar.bz2
upstream-0180abdf4933f1d7536daa0c6139886077af9ee3.zip
busybox: avoid infinite loop in lsmod (#4834)
SVN-Revision: 15071
-rw-r--r--package/busybox/Makefile2
-rw-r--r--package/busybox/patches/810-lsmod-infinite-loop.patch11
2 files changed, 12 insertions, 1 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 3f27ec66c4..8eede35993 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=busybox
PKG_VERSION:=1.11.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.busybox.net/downloads \
diff --git a/package/busybox/patches/810-lsmod-infinite-loop.patch b/package/busybox/patches/810-lsmod-infinite-loop.patch
new file mode 100644
index 0000000000..8bc8cd0a76
--- /dev/null
+++ b/package/busybox/patches/810-lsmod-infinite-loop.patch
@@ -0,0 +1,11 @@
+--- a/modutils/lsmod.c
++++ b/modutils/lsmod.c
+@@ -107,7 +107,7 @@
+ continue;
+ } else if (errno != ENOSPC)
+ bb_perror_msg_and_die("module %s: QM_REFS", mn);
+- deps = xrealloc(deps, count);
++ deps = xrealloc(deps, depsize = count);
+ }
+ printf("%-20s%8lu%4ld", mn, info.size, info.usecount);
+ if (info.flags & NEW_MOD_DELETED)