When insmod work had moved to module-init-tools, there was some modifications to
check for allocation failures and avoid using invalid results. These changes
were made in the
https://git.kernel.org/pub/scm/utils/kernel/module-init-tools/module-init-tools.git
repository. Since insmod has been restored to klibc, those changes have not yet
been merged back to this version. The patch below merges the different commits
together.
diff --git a/usr/utils/insmod.c b/usr/utils/insmod.c
index 47b58800..435fed21 100644
--- a/usr/utils/insmod.c
+++ b/usr/utils/insmod.c
@@ -58,8 +58,8 @@ static const char *moderror(int err)
static void *grab_file(const char *filename, unsigned long *size)
{
unsigned int max = 16384;
- int ret, fd;
- void *buffer = malloc(max);
+ int ret, fd, err_save;
+ void *buffer;
if (streq(filename, "-"))
fd = dup(STDIN_FILENO);
@@ -69,11 +69,21 @@ static void *grab_file(const char *filename, unsigned long
*size)
if (fd < 0)
return NULL;
+ buffer = malloc(max);
+ if (!buffer)
+ goto out_error;
+
*size = 0;
while ((ret = read(fd, buffer + *size, max - *size)) > 0) {
*size += ret;
- if (*size == max)
- buffer = realloc(buffer, max *= 2);
+ if (*size == max) {
+ void* p;
+
+ p = realloc(buffer, max *= 2);
+ if (!p)
+ goto out_error;
+ buffer = p;
+ }
}
if (ret < 0) {
free(buffer);
@@ -81,6 +91,13 @@ static void *grab_file(const char *filename, unsigned long
*size)
}
close(fd);
return buffer;
+
+out_error:
+ err_save = errno;
+ free(buffer);
+ close(fd);
+ errno = err_save;
+ return NULL;
}
int main(int argc, char *argv[])
@@ -113,6 +130,11 @@ int main(int argc, char *argv[])
for (i = 2; i < argc; i++) {
options = realloc(options,
strlen(options) + 2 +
strlen(argv[i]) + 2);
+ if (!options) {
+ fprintf(stderr, "insmod:
can't allocate memory: %sn",
+ strerror(errno));
+ exit(1);
+ }
/* Spaces handled by "" pairs, but no way
of escaping
quotes */
if (strchr(argv[i], ' '))
@@ -134,7 +156,10 @@ int main(int argc, char *argv[])
if (ret != 0) {
fprintf(stderr, "insmod: error inserting
'%s': %li %s\n",
filename, ret, moderror(errno));
- exit(1);
}
+ free(file);
+
+ if (ret != 0)
+ exit(1);
exit(0);
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<https://lists.zytor.com/archives/klibc/attachments/20250226/9dc54c14/attachment.htm>
On Wed, 2025-02-26 at 14:06 +0000, Guthrie, Kevin wrote:> When insmod work had moved to module-init-tools, there was some modifications to check for allocation failures and avoid using invalid results. These changes were made in the https://git.kernel.org/pub/scm/utils/kernel/module-init-tools/module-init-tools.git repository. Since insmod has been restored to klibc, those changes have not yet been merged back to this version. The patch below merges the different commits together. >This needs a Signed-off-by line as the Developer Certificate of Origin <https://developercertificate.org/>.> diff --git a/usr/utils/insmod.c b/usr/utils/insmod.c > index 47b58800..435fed21 100644 > --- a/usr/utils/insmod.c > +++ b/usr/utils/insmod.c > @@ -58,8 +58,8 @@ static const char *moderror(int err) > static void *grab_file(const char *filename, unsigned long *size) > { > unsigned int max = 16384; > - int ret, fd; > - void *buffer = malloc(max); > + int ret, fd, err_save; > + void *buffer; > if (streq(filename, "-")) > fd = dup(STDIN_FILENO);[...] This patch is mangled; the source is supposed to be indented with tabs but your mailer has converted the tabs to spaces. See <https://docs.kernel.org/process/email-clients.html> for advice on how to avoid this. Ben. -- Ben Hutchings Teamwork is essential - it allows you to blame someone else. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: This is a digitally signed message part URL: <https://lists.zytor.com/archives/klibc/attachments/20250302/ae8b2cde/attachment.sig>