From 4144504912954b0d31c5bbe5f13df5a4ec4f122a Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 13 Apr 2009 20:32:31 +0000 Subject: [PATCH] modutils: remove redundant sanitization --- modutils/modutils.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modutils/modutils.c b/modutils/modutils.c index ef4f6191b..44dae7bc5 100644 --- a/modutils/modutils.c +++ b/modutils/modutils.c @@ -5,7 +5,6 @@ * * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ - #include "modutils.h" #ifdef __UCLIBC__ @@ -111,9 +110,9 @@ char * FAST_FUNC parse_cmdline_module_options(char **argv) int FAST_FUNC bb_init_module(const char *filename, const char *options) { - size_t len = MAXINT(ssize_t); + size_t len; char *image; - int rc = ENOENT; + int rc; if (!options) options = ""; @@ -124,10 +123,12 @@ int FAST_FUNC bb_init_module(const char *filename, const char *options) #endif /* Use the 2.6 way */ + len = INT_MAX - 4095; + rc = ENOENT; image = xmalloc_open_zipped_read_close(filename, &len); if (image) { rc = 0; - if (init_module(image, len, options ? options : "") != 0) + if (init_module(image, len, options) != 0) rc = errno; free(image); }