Skip to content

Fix format specifier mismatches on 32-bit builds #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
siraben wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix format specifier mismatches on 32-bit builds #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05aa7e2
esl-iter: fix format specifiers for 32-bit builds
siraben Apr 19, 2026
41ebf55
esl-iter: simplify buffer pointer arithmetic
siraben Apr 19, 2026
db07ec9
secdb: use %zu/%zx format specifiers for size_t
siraben Apr 19, 2026
dcc267b
efivarfs: use %zu for size_t in error messages
siraben Apr 19, 2026
3633172
efivar, efisecdb: use PRIu64 for well-known-guids count
siraben Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/efisecdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <errno.h>
#include <fcntl.h>
#include <getopt.h>
#include <inttypes.h>
#include <stdarg.h>
#include <stdint.h>
#include <stdlib.h>
Expand Down Expand Up @@ -244,7 +245,7 @@ list_guids(void)
const uint64_t n = efi_n_well_known_guids;
unsigned int i;

debug("&guid[0]:%p n:%lu", &guid[0], n);
debug("&guid[0]:%p n:%"PRIu64, &guid[0], n);
for (i = 0; i < n; i++) {
printf("{"GUID_FORMAT"}\t",
GUID_FORMAT_ARGS(&guid[i].guid));
Expand Down
3 changes: 2 additions & 1 deletion src/efivar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <err.h>
#include <fcntl.h>
#include <getopt.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
Expand Down Expand Up @@ -573,7 +574,7 @@ int main(int argc, char *argv[])
const uint64_t n = efi_n_well_known_guids;
size_t i;

debug("&guid[0]:%p n:%lu end:%p", &guid[0], n, &guid[n]);
debug("&guid[0]:%p n:%"PRIu64" end:%p", &guid[0], n, &guid[n]);
for (i = 0; i < n; i++) {
printf("{"GUID_FORMAT"}\t",
GUID_FORMAT_ARGS(&guid[i].guid));
Expand Down
4 changes: 2 additions & 2 deletions src/efivarfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ get_esp_filepath(const char *filename, char *filepath, size_t sz)

rc = snprintf(filepath, sz, "%s%s", esp_paths[i], filename);
if (rc >= sz) {
fprintf(stderr, "Error: Filepath too big. Max allowed %ld\n", sz);
fprintf(stderr, "Error: Filepath too big. Max allowed %zu\n", sz);
return -1;
}
if (!stat(filepath, &buffer))
Expand All @@ -120,7 +120,7 @@ get_esp_filename(char *filename, size_t sz)
return rc;

if (size > sz) {
fprintf(stderr, "Error: Filename too big. Max allowed %ld\n", sz);
fprintf(stderr, "Error: Filename too big. Max allowed %zu\n", sz);
free(data);
return -1;
}
Expand Down
45 changes: 22 additions & 23 deletions src/esl-iter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,24 +324,24 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,
debug("Getting next ESL buffer (correct_size:%d)", correct_size);
iter->esl = (efi_signature_list_t *)iter->buf;

debug("list has %lu bytes left, element is %"PRIu32"(0x%"PRIx32") bytes",
iter->len - iter->offset,
debug("list has %zu bytes left, element is %"PRIu32"(0x%"PRIx32") bytes",
(size_t)(iter->len - iter->offset),
iter->esl->signature_list_size,
iter->esl->signature_list_size);

if (iter->len - iter->offset < iter->esl->signature_list_size) {
debug("EFI_SIGNATURE_LIST is malformed: len:%zd(0x%zx) offset:%zd(0x%zx) len-off:%zd(0x%zx) esl_size:%"PRIu32"(0x%"PRIx32")",
debug("EFI_SIGNATURE_LIST is malformed: len:%zu(0x%zx) offset:%jd(0x%jx) len-off:%jd(0x%jx) esl_size:%"PRIu32"(0x%"PRIx32")",
iter->len, iter->len,
iter->offset, iter->offset,
iter->len - iter->offset, iter->len - iter->offset,
(intmax_t)iter->offset, (uintmax_t)iter->offset,
(intmax_t)(iter->len - iter->offset), (uintmax_t)(iter->len - iter->offset),
iter->esl->signature_list_size, iter->esl->signature_list_size);
if (correct_size && (iter->len - iter->offset) > 0) {
warnx("correcting ESL size from %d to %jd at %lx",
warnx("correcting ESL size from %d to %jd at 0x%jx",
iter->esl->signature_list_size,
(intmax_t)(iter->len - iter->offset), (unsigned long)iter->offset);
debug("correcting ESL size from %d to %zd at %lx",
(intmax_t)(iter->len - iter->offset), (uintmax_t)iter->offset);
debug("correcting ESL size from %d to %zu at 0x%jx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
(size_t)(iter->len - iter->offset), (uintmax_t)iter->offset);
iter->esl->signature_list_size = iter->len - iter->offset;
} else {
efi_error("EFI_SIGNATURE_LIST is malformed");
Expand All @@ -352,21 +352,21 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,

} else {
debug("Getting next efi_signature_list_t");
debug("list has %lu bytes left, element is %"PRIu32" bytes",
iter->len - iter->offset,
debug("list has %zu bytes left, element is %"PRIu32" bytes",
(size_t)(iter->len - iter->offset),
iter->esl->signature_list_size);
efi_guid_t type;
errno = 0;
esl_list_get_type(iter, &type);
if (iter->len - iter->offset < iter->esl->signature_list_size) {
debug("EFI_SIGNATURE_LIST is malformed");
if (correct_size && (iter->len - iter->offset) > 0) {
warnx("correcting ESL size from %d to %jd at 0x%lx",
warnx("correcting ESL size from %d to %jd at 0x%jx",
iter->esl->signature_list_size,
(intmax_t)(iter->len - iter->offset), (unsigned long)iter->offset);
debug("correcting ESL size from %d to %zd at 0x%lx",
(intmax_t)(iter->len - iter->offset), (uintmax_t)iter->offset);
debug("correcting ESL size from %d to %zu at 0x%jx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
(size_t)(iter->len - iter->offset), (uintmax_t)iter->offset);
iter->esl->signature_list_size = iter->len - iter->offset;
} else {
debug("EFI_SIGNATURE_LIST is malformed");
Expand Down Expand Up @@ -395,8 +395,7 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,
iter->offset += iter->esl->signature_list_size;
if ((uint32_t)iter->offset >= iter->len)
return 0;
iter->esl = (efi_signature_list_t *)((intptr_t)iter->buf
+ (unsigned long)iter->offset);
iter->esl = (efi_signature_list_t *)(iter->buf + (size_t)iter->offset);
}

efi_signature_list_t esl;
Expand All @@ -406,19 +405,19 @@ esl_list_iter_next_with_size_correction(esl_list_iter *iter, efi_guid_t *type,
if (!memcmp(&esl, iter->esl, sizeof(esl)))
return 0;

debug("signature list size:%d iter->len:%zd iter->offset:%zd signature_size:%u",
iter->esl->signature_list_size, iter->len, iter->offset,
debug("signature list size:%d iter->len:%zu iter->offset:%jd signature_size:%u",
iter->esl->signature_list_size, iter->len, (intmax_t)iter->offset,
iter->esl->signature_size);
/* if this list size is too big for our data, then it's malformed */
if (iter->esl->signature_list_size > iter->len - iter->offset) {
debug("EFI_SIGNATURE_LIST is malformed");
if (correct_size && (iter->len - iter->offset) > 0) {
warnx("correcting ESL size from %d to %jd at 0x%lx",
warnx("correcting ESL size from %d to %jd at 0x%jx",
iter->esl->signature_list_size,
(intmax_t)(iter->len - iter->offset), (unsigned long)iter->offset);
debug("correcting ESL size from %d to %zd at 0x%lx",
(intmax_t)(iter->len - iter->offset), (uintmax_t)iter->offset);
debug("correcting ESL size from %d to %zu at 0x%jx",
iter->esl->signature_list_size,
iter->len - iter->offset, iter->offset);
(size_t)(iter->len - iter->offset), (uintmax_t)iter->offset);
iter->esl->signature_list_size = iter->len - iter->offset;
} else {
efi_error("EFI_SIGNATURE_LIST is malformed");
Expand Down
2 changes: 1 addition & 1 deletion src/secdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ efi_secdb_add_entry_or_secdb(efi_secdb_t *top,
return 0;
}

debug("adding %zd(0x%lx) bytes of data", datasz, datasz);
debug("adding %zu(0x%zx) bytes of data", datasz, datasz);
secdb_add_entry_data(secdb, owner, data, datasz);
if (sort_data && secdb->sigsz) {
debug("sorting data %s", sort_descending ? "desc" : "asc");
Expand Down
2 changes: 1 addition & 1 deletion src/secdb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ secdb_entry_size(efi_secdb_t *secdb)
sz = sizeof(efi_signature_list_t)
+ secdb->hdrsz
+ secdb->sigsz * secdb->nsigs;
debug("secdb:%p sz:%zd (0x%lx)", secdb, sz, sz);
debug("secdb:%p sz:%zu (0x%zx)", secdb, sz, sz);
return sz;
}

Expand Down