From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 28 Jan 2022 12:13:30 +0100
Subject: [PATCH 1/2] efisecdb: fix build with musl libc
Refactor code to use POSIX atexit(3) instead of the GNU specific
on_exit(3).
Resolves: #197
Resolves: #202
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
src/compiler.h | 2 --
src/efisecdb.c | 68 +++++++++++++++++++-------------------------------
2 files changed, 26 insertions(+), 44 deletions(-)
diff --git a/src/compiler.h b/src/compiler.h
index e2f18f0b..d95fb014 100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -7,8 +7,6 @@
#ifndef COMPILER_H_
#define COMPILER_H_
-#include <sys/cdefs.h>
-
/* GCC version checking borrowed from glibc. */
#if defined(__GNUC__) && defined(__GNUC_MINOR__)
# define GNUC_PREREQ(maj,min) \
diff --git a/src/efisecdb.c b/src/efisecdb.c
index f8823737..6bd5ad90 100644
--- a/src/efisecdb.c
+++ b/src/efisecdb.c
@@ -25,6 +25,10 @@
extern char *optarg;
extern int optind, opterr, optopt;
+static efi_secdb_t *secdb = NULL;
+static list_t infiles;
+static list_t actions;
+
struct hash_param {
char *name;
efi_secdb_type_t algorithm;
@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner,
}
static void
-free_actions(int status UNUSED, void *actionsp)
+free_actions(void)
{
- list_t *actions = (list_t *)actionsp;
list_t *pos, *tmp;
- for_each_action_safe(pos, tmp, actions) {
+ for_each_action_safe(pos, tmp, &actions) {
action_t *action = list_entry(pos, action_t, list);
list_del(&action->list);
@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp)
}
static void
-free_infiles(int status UNUSED, void *infilesp)
+free_infiles(void)
{
- list_t *infiles = (list_t *)infilesp;
list_t *pos, *tmp;
- for_each_ptr_safe(pos, tmp, infiles) {
+ for_each_ptr_safe(pos, tmp, &infiles) {
ptrlist_t *entry = list_entry(pos, ptrlist_t, list);
list_del(&entry->list);
@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp)
}
static void
-maybe_free_secdb(int status UNUSED, void *voidp)
+maybe_free_secdb(void)
{
- efi_secdb_t **secdbp = (efi_secdb_t **)voidp;
-
- if (secdbp == NULL || *secdbp == NULL)
+ if (secdb == NULL)
return;
- efi_secdb_free(*secdbp);
-}
-
-static void
-maybe_do_unlink(int status, void *filep)
-{
- char **file = (char **)filep;
-
- if (status == 0)
- return;
- if (file == NULL || *file == NULL)
- return;
-
- unlink(*file);
+ efi_secdb_free(secdb);
}
static void
@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
return status;
}
-/*
- * These need to be static globals so that they're not on main's stack when
- * on_exit() fires.
- */
-static efi_secdb_t *secdb = NULL;
-static list_t infiles;
-static list_t actions;
-static char *outfile = NULL;
-
int
main(int argc, char *argv[])
{
@@ -351,6 +329,7 @@ main(int argc, char *argv[])
bool do_sort_data = false;
bool sort_descending = false;
int status = 0;
+ char *outfile = NULL;
const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?";
const struct option lopts[] = {
@@ -376,10 +355,9 @@ main(int argc, char *argv[])
INIT_LIST_HEAD(&infiles);
INIT_LIST_HEAD(&actions);
- on_exit(free_actions, &actions);
- on_exit(free_infiles, &infiles);
- on_exit(maybe_free_secdb, &secdb);
- on_exit(maybe_do_unlink, &outfile);
+ atexit(free_actions);
+ atexit(free_infiles);
+ atexit(maybe_free_secdb);
/*
* parse the command line.
@@ -587,24 +565,30 @@ main(int argc, char *argv[])
outfd = open(outfile, flags, 0600);
if (outfd < 0) {
char *tmpoutfile = outfile;
- if (errno == EEXIST)
- outfile = NULL;
+ if (errno != EEXIST)
+ unlink(outfile);
err(1, "could not open \"%s\"", tmpoutfile);
}
rc = ftruncate(outfd, 0);
- if (rc < 0)
+ if (rc < 0) {
+ unlink(outfile);
err(1, "could not truncate output file \"%s\"", outfile);
+ }
void *output;
size_t size = 0;
rc = efi_secdb_realize(secdb, &output, &size);
- if (rc < 0)
+ if (rc < 0) {
+ unlink(outfile);
secdb_err(1, "could not realize signature list");
+ }
rc = write(outfd, output, size);
- if (rc < 0)
+ if (rc < 0) {
+ unlink(outfile);
err(1, "could not write signature list");
+ }
close(outfd);
xfree(output);
From df09b472419466987f2f30176dd00937e640aa9a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 28 Jan 2022 12:29:00 +0100
Subject: [PATCH 2/2] efisecdb: do not free optarg
The *outfile passed to parse_input_files can only be either set to
optarg or be NULL. optarg should not be free'd and NULL does not need
to.
Since we no longer use on_exit to unlink outfile we also don't need to
set *outfile to NULL.
Fixes commit d91787035bc1 (efisecdb: add efisecdb)
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
---
src/efisecdb.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/efisecdb.c b/src/efisecdb.c
index 6bd5ad90..70fa1847 100644
--- a/src/efisecdb.c
+++ b/src/efisecdb.c
@@ -255,8 +255,7 @@ list_guids(void)
* failure.
*/
static int
-parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
- bool dump)
+parse_input_files(list_t *infiles, efi_secdb_t **secdb, bool dump)
{
int status = 0;
list_t *pos, *tmp;
@@ -297,8 +296,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb,
if (!dump)
exit(1);
status = 1;
- xfree(*outfile);
- *outfile = NULL;
break;
}
}
@@ -528,7 +525,7 @@ main(int argc, char *argv[])
efi_secdb_set_bool(secdb, EFI_SECDB_SORT_DATA, do_sort_data);
efi_secdb_set_bool(secdb, EFI_SECDB_SORT_DESCENDING, sort_descending);
- status = parse_input_files(&infiles, &outfile, &secdb, dump);
+ status = parse_input_files(&infiles, &secdb, dump);
if (status == 0) {
for_each_action_safe(pos, tmp, &actions) {
action_t *action = list_entry(pos, action_t, list);
