korg/kmod
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git synced 2024-12-04 09:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

libkmod: use a dup()'d fd for zlib

Browse Source 
The gzdopen() API used, takes ownership of the fd. To make that more
explicit we clear it (-1) as applicable.

Yet again, kmod has explicit API to return the fd to the user - which
currently is used solely when uncompressed, so we're safe.

Regardless - simply duplicate the fd locally and use that with zlib.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
This commit is contained in:
Emil Velikov 2024-02-12 17:23:02 +00:00 committed by Lucas De Marchi
parent b0a78466d0
commit d6cd6c74d2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libkmod/libkmod-file.c
View File

@ -317,12 +317,18 @@ static int load_zlib(struct kmod_file *file)
int err = 0;
off_t did = 0, total = 0;
_cleanup_free_ unsigned char *p = NULL;
int gzfd;
errno = 0;
file->gzf = gzdopen(file->fd, "rb");
if (file->gzf == NULL)
gzfd = fcntl(file->fd, F_DUPFD_CLOEXEC, 3);
if (gzfd < 0)
return -errno;
file->fd = -1; /* now owned by gzf due gzdopen() */
file->gzf = gzdopen(gzfd, "rb"); /* takes ownership of the fd */
if (file->gzf == NULL) {
close(gzfd);
return -errno;
}
for (;;) {
int r;
@ -359,7 +365,7 @@ static int load_zlib(struct kmod_file *file)
return 0;
error:
gzclose(file->gzf);
gzclose(file->gzf); /* closes the gzfd */
return err;
}
@ -368,7 +374,7 @@ static void unload_zlib(struct kmod_file *file)
if (file->gzf == NULL)
return;
free(file->memory);
gzclose(file->gzf); /* closes file->fd */
gzclose(file->gzf);
}
static const char magic_zlib[] = {0x1f, 0x8b};
@ -535,7 +541,6 @@ void kmod_file_unref(struct kmod_file *file)
if (file->memory)
file->ops->unload(file);
if (file->fd >= 0)
close(file->fd);
close(file->fd);
free(file);
}