From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: Re: [PATCH] Add support for mkostemp, mkstemps and mkostemps
Date: Mon, 28 Jan 2013 10:37:55 +0100 [thread overview]
Message-ID: <20130128093755.GI10600@port70.net> (raw)
In-Reply-To: <1359349583-3643-1-git-send-email-basile@opensource.dyc.edu>
* Anthony G. Basile <basile@opensource.dyc.edu> [2013-01-28 00:06:23 -0500]:
> +#include <string.h>
> +#include <unistd.h>
> +#include <errno.h>
> +#include <time.h>
> +#include <stdint.h>
> +#include "libc.h"
libc.h, errno.h, unistd.h are not used
> +
> +char *__randname(char *template)
> +{
> + struct timespec ts;
> + size_t i, l = strlen(template);
> + unsigned long r;
can be unsigned char r;
> +
> + /* This assumes that a check for the template
> + size has alrady been made */
> + clock_gettime(CLOCK_REALTIME, &ts);
> + r = ts.tv_nsec + (uintptr_t)&ts / 16 + (uintptr_t)template;
> + for (i=1; i<=6; i++, r>>=4)
> + template[l-i] = 'A'+(r&15);
it seems to use only 4bit entropy based on clock (and fixed addresses)
and (uintptr_t)template does not give much entropy if it's malloced
and if the clock source is bad for some reason (eg cpu clock mod 16ns
is even) then this might not even give different result for each retry
(may be it helps if retry count is included)
> +
> + return template;
> +}
> diff --git a/src/temp/tempfile.c b/src/temp/tempfile.c
i'd use different name, eg __tempfile.c to signify that it's internal
> new file mode 100644
> index 0000000..93808a6
> --- /dev/null
> +++ b/src/temp/tempfile.c
> @@ -0,0 +1,42 @@
> +#include <string.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <fcntl.h>
> +#include <unistd.h>
> +#include <limits.h>
> +#include <errno.h>
> +#include "libc.h"
stdlib.h, limits.h are not used
libc.h is not used
(in the other files it is needed for weak_alias)
> +
> +char *__randname(char *);
> +
> +int __open_tempfile (char *template, int len, int flags)
> +{
> + if (len < 0) return EINVAL;
> +
> + int l = strlen(template)-len;
int vs size_t problem
> + if (l < 6 || strncmp(template+l-6, "XXXXXX",6)) {
> + errno = EINVAL;
> + *template = 0;
> + return -1;
> + }
> +
> + /* Null terminate the template before the suffix,
> + and save the char for adding back the suffix */
> + char suffix = template[l];
> + template[l] = '\0';
> +
i'd do __randname(template, length-suffix)
so pass the template len as an argument
then no suffix saving is needed
> + int fd, retries = 100, t0 = *template;
100 retries does not make sense if only 4bit entropy is used
(there are 16 different names for the given addresses)
> + while (retries--) {
> + if (!*__randname(template)) return -1;
> + /* Add back the suffix */
> + template[l] = suffix;
> + if ((fd = open(template, flags | O_CREAT | O_EXCL, 0600))>=0)
> + return fd;
> + if (errno != EEXIST) return -1;
> + /* this is safe because mktemp verified
> + * that we have a valid template string */
> + template[0] = t0;
i dont understand why template[0] gets clobbered
> + strcpy(template+l-6, "XXXXXX");
i'd use memcpy or memset to avoid suffix saving
> + }
> + return -1;
> +}
> --
> 1.7.12.4
next prev parent reply other threads:[~2013-01-28 9:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 5:06 Anthony G. Basile
2013-01-28 8:47 ` John Spencer
2013-01-28 9:37 ` Szabolcs Nagy [this message]
2013-01-28 17:33 ` Szabolcs Nagy
2013-01-29 23:16 ` Anthony G. Basile
2013-01-30 7:21 ` Rich Felker
2013-01-30 7:59 ` Hardy Falk
2013-01-30 13:45 ` Szabolcs Nagy
2013-01-30 16:51 ` Rich Felker
2013-01-30 19:12 ` Szabolcs Nagy
2013-01-30 19:22 ` Rich Felker
2013-01-31 0:28 ` Szabolcs Nagy
2013-01-28 16:33 ` Rich Felker
2013-02-02 3:48 ` Rich Felker
2013-02-02 18:46 ` Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2013-02-02 21:15 Anthony G. Basile
2013-02-02 21:17 ` Anthony G. Basile
2013-02-03 3:30 ` Rich Felker
2013-02-02 18:45 Anthony G. Basile
2013-02-02 19:51 ` John Spencer
2013-02-02 19:59 ` John Spencer
2013-02-02 22:11 ` Szabolcs Nagy
2013-02-02 20:14 ` Szabolcs Nagy
2013-02-02 20:38 ` Anthony G. Basile
2013-02-02 22:22 ` Szabolcs Nagy
2013-01-28 2:36 Anthony G. Basile
2013-01-28 5:01 ` Anthony G. Basile
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=20130128093755.GI10600@port70.net \
--to=nsz@port70.net \
--cc=musl@lists.openwall.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public 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).