From e2e321fc2013086f0bdb6a011159f201a06d1b06 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sat, 3 Dec 2022 11:55:38 +0000 Subject: util/nvmutil: use BUFSIZ for rmac size in hextonum I will be using this function elsewhere, and in general I want this to be usable for lots of programs. --- util/nvmutil/nvmutil.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index 11484533..4a021654 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -219,18 +219,18 @@ hextonum(char chs) uint8_t val8, ch; static int macfd; static uint8_t *rmac = NULL; - static int random; - if (random > 11) { + static size_t random; + if (random == BUFSIZ) { close(macfd); free(rmac); rmac = NULL; } if (rmac == NULL) { random = 0; - if ((rmac = (uint8_t *) malloc(12)) == NULL) + if ((rmac = (uint8_t *) malloc(BUFSIZ)) == NULL) err(1, NULL); - if (readFromFile(&macfd, rmac, "/dev/urandom", O_RDONLY, 12) - != 12) { + if (readFromFile(&macfd, rmac, "/dev/urandom", O_RDONLY, + BUFSIZ) != BUFSIZ) { warn("%s", "/dev/urandom"); return 16; } -- cgit v1.2.1