From: "Jason A. Donenfeld" <Jason@zx2c4.com> To: Rich Felker <dalias@libc.org>, musl@lists.openwall.com Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Subject: [musl] [PATCH v3] getentropy: fail if buffer not completely filled Date: Sun, 10 Apr 2022 00:58:50 +0200 [thread overview] Message-ID: <20220409225851.715796-2-Jason@zx2c4.com> (raw) In-Reply-To: <20220409225851.715796-1-Jason@zx2c4.com> The man page for getentropy says that it either completely succeeds or completely fails for values < 256, so we can simplify this scenario by omitting the loop. As a safeguard, we still return EIO if it returns short, but otherwise we pass the error on through to the caller. --- Changes v2->v3: - v3 gets rid of the loop entirely. src/misc/getentropy.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/misc/getentropy.c b/src/misc/getentropy.c index 651ea95f..e8cb4d02 100644 --- a/src/misc/getentropy.c +++ b/src/misc/getentropy.c @@ -6,8 +6,8 @@ int getentropy(void *buffer, size_t len) { - int cs, ret = 0; - char *pos = buffer; + ssize_t ret; + int cs; if (len > 256) { errno = EIO; @@ -15,19 +15,13 @@ int getentropy(void *buffer, size_t len) } pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); - - while (len) { - ret = getrandom(pos, len, 0); - if (ret < 0) { - if (errno == EINTR) continue; - else break; - } - pos += ret; - len -= ret; - ret = 0; - } - + ret = getrandom(buffer, len, 0); pthread_setcancelstate(cs, 0); - return ret; + if (ret != len) { + if (ret >= 0) + errno = EIO; + return -1; + } + return 0; } -- 2.35.1
next prev parent reply other threads:[~2022-04-10 11:07 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-09 0:10 [musl] [PATCH] " Jason A. Donenfeld 2022-04-09 13:18 ` Rich Felker 2022-04-09 22:50 ` Jason A. Donenfeld 2022-04-09 22:58 ` [musl] [PATCH v2] " Jason A. Donenfeld 2022-04-09 22:58 ` Jason A. Donenfeld [this message] 2022-04-10 15:30 ` Rich Felker
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220409225851.715796-2-Jason@zx2c4.com \ --to=jason@zx2c4.com \ --cc=dalias@libc.org \ --cc=musl@lists.openwall.com \ --subject='Re: [musl] [PATCH v3] getentropy: fail if buffer not completely filled' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Code repositories for project(s) associated with this inbox: https://git.vuxu.org/mirror/musl/ This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).