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 v2] getentropy: fail if buffer not completely filled Date: Sun, 10 Apr 2022 00:58:49 +0200 [thread overview] Message-ID: <20220409225851.715796-1-Jason@zx2c4.com> (raw) In-Reply-To: <CAHmME9o4C_G2CvmE-K8HVbZCbvdDUKp0XHJ0C28mmTs_zywGTw@mail.gmail.com> The man page for getentropy says that it either completely succeeds or completely fails, and indeed this is what glibc does. However, musl has a condition where it breaks out of the loop early, yet still returns a success. This patch fixes that by returning a success only if the buffer is completely filled. --- Changes v2->v3: - This gets rid of the ret==0 check like glibc uses. src/misc/getentropy.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/misc/getentropy.c b/src/misc/getentropy.c index 651ea95f..964b8c10 100644 --- a/src/misc/getentropy.c +++ b/src/misc/getentropy.c @@ -6,7 +6,7 @@ int getentropy(void *buffer, size_t len) { - int cs, ret = 0; + int cs, ret; char *pos = buffer; if (len > 256) { @@ -24,10 +24,13 @@ int getentropy(void *buffer, size_t len) } pos += ret; len -= ret; - ret = 0; } pthread_setcancelstate(cs, 0); - return ret; + if (len) { + 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 ` Jason A. Donenfeld [this message] 2022-04-09 22:58 ` [musl] [PATCH v3] " Jason A. Donenfeld 2022-04-10 15:30 ` [musl] [PATCH v2] " 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-1-Jason@zx2c4.com \ --to=jason@zx2c4.com \ --cc=dalias@libc.org \ --cc=musl@lists.openwall.com \ --subject='Re: [musl] [PATCH v2] 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).