1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
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>
--- 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) \
--- 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 a
}
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 *ac
}
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 *in
}
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
@@ -268,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;
@@ -310,8 +296,6 @@ parse_input_files(list_t *infiles, char
if (!dump)
exit(1);
status = 1;
- xfree(*outfile);
- *outfile = NULL;
break;
}
}
@@ -323,15 +307,6 @@ parse_input_files(list_t *infiles, char
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 +326,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 +352,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.
@@ -550,7 +525,7 @@ sort_err:
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);
@@ -587,24 +562,30 @@ sort_err:
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);
|