From 970a4d2baadffed319b9c79f77b44f0dfc347014 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Thu, 9 Apr 2009 11:05:29 +0000 Subject: [PATCH] merge r15071 to 8.09 (closes: #4834) SVN-Revision: 15163 --- package/busybox/Makefile | 2 +- package/busybox/patches/810-lsmod-infinite-loop.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 package/busybox/patches/810-lsmod-infinite-loop.patch diff --git a/package/busybox/Makefile b/package/busybox/Makefile index a302ade250..21e2f4cf52 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=busybox PKG_VERSION:=1.11.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 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) -- 2.30.2