From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Cc: Josiah Worcester <josiahw@gmail.com>
Subject: Re: [PATCH] Implement glibc *_chk interfaces for ABI compatibility.
Date: Wed, 17 Jun 2015 11:30:56 +0200 [thread overview]
Message-ID: <20150617093056.GD22285@port70.net> (raw)
In-Reply-To: <1434509291-28997-1-git-send-email-josiahw@gmail.com>
* Josiah Worcester <josiahw@gmail.com> [2015-06-16 21:48:11 -0500]:
> --- /dev/null
> +++ b/src/compat/gnu_chk.c
> @@ -0,0 +1,18 @@
> +#define _GNU_SOURCE
> +#include <string.h>
> +#include <poll.h>
> +#include <stddef.h>
> +#include "atomic.h"
> +#include "atomic.h"
> +
> +int __ppoll_chk(struct pollfd *fds, nfds_t n, const struct timespec *to, const sigset_t *mask, size_t fdslen)
> +{
> + if (fdslen / sizeof(*fds) < n) a_crash();
> + return ppoll(fds, n, to, mask);
> +}
> +
> +void *__mempcpy_chk(void *dest, const void *src, size_t n, size_t destlen)
> +{
> + if (destlen < n) a_crash();
> + return mempcpy(dest, src, n);
> +}
one atomic is enough
> +char *__gets_chk(char *buf, size_t size)
> +{
> + char *ret = buf;
> + int c;
> + FLOCK(stdin);
> + if (!size) return NULL;
> + for(;size;buf++,size--) {
> + c = getc(stdin);
> + if ((c == EOF && feof(stdin)) || c == '\n') {
> + *buf = 0;
> + FUNLOCK(stdin);
> + return ret;
> + }
> + if (c == EOF) {
> + FUNLOCK(stdin);
> + return NULL;
> + }
> + *buf = c;
> + }
> + a_crash();
> +}
this looks wrong if !size
i think that line should be just removed
> +void *__memmove_chk(void *restrict dest, const void *restrict src, size_t n, size_t destlen)
> +{
> + if (n > destlen) a_crash();
> + return memmove(dest, src, n);
> +}
i think restrict is wrong here
> +char *__strcat_chk(char *restrict dest, const char *restrict src, size_t destlen)
> +{
> + size_t tot;
> + tot = strnlen(src, destlen);
> + if (tot > SIZE_MAX - strnlen(dest, destlen) - 1) a_crash();
> + tot += strnlen(dest, destlen) + 1;
> + if (tot > destlen) a_crash();
> + return strcat(dest, src);
> +}
> +
> +char *__strncat_chk(char *restrict dest, const char *restrict src, size_t n, size_t destlen)
> +{
> + size_t tot;
> + tot = strnlen(dest, destlen);
> + if (tot > SIZE_MAX - strnlen(src, n) - 1) a_crash();
> + tot += strnlen(src, n) + 1;
> + if (tot > destlen) a_crash();
> + return strncat(dest, src, n);
> +}
> +
i'd store the strnlen result in a temporary var
musl is built with -ffreestanding so the compiler cannot
assume strnlen is a pure function.
> +wchar_t *__wcscat_chk(wchar_t *restrict dest, const wchar_t *src, size_t destlen)
> +{
> + size_t tot;
> + tot = wcsnlen(src, destlen);
> + if (tot > SIZE_MAX - wcsnlen(dest, destlen) - 1) a_crash();
> + tot += wcsnlen(dest, destlen) + 1;
> + if (tot > destlen) a_crash();
> + return wcscat(dest, src);
> +}
> +
> +wchar_t *__wcsncat_chk(wchar_t *restrict dest, const wchar_t *restrict src, size_t n, size_t destlen)
> +{
> + size_t tot;
> + tot = wcsnlen(dest, destlen);
> + if (tot > SIZE_MAX - wcsnlen(src, n) - 1) a_crash();
> + tot += wcsnlen(dest, destlen) + 1;
> + if (tot > destlen) a_crash();
> + return wcsncat(dest, src, n);
> +}
> +
ditto
> diff --git a/src/compat/ttyname_r_chk.c b/src/compat/ttyname_r_chk.c
> new file mode 100644
> index 0000000..50e70e5
> --- /dev/null
> +++ b/src/compat/ttyname_r_chk.c
> @@ -0,0 +1,7 @@
> +#include <unistd.h>
> +
> +int __ttyname_r_chk(int fd, char *name, size_t size, size_t namelen)
> +{
> + if (size > namelen) a_crash();
> + return ttyname_r(fd, name, size);
> +}
missing atomic.h for a_crash
shouldnt this be in posix_chk.c?
> +size_t __wcrtomb_chk(char *restrict s, wchar_t wc, mbstate_t *restrict st, size_t slen)
> +{
> + if (slen < MB_CUR_MAX) a_crash();
> + return wcrtomb(s, wc, st);
> +}
i think this can cause a false positive crash
but glibc seems to do the same..
(eg some api passes wchar_t* and the exact mb encoded length of
a string so the output s can be safely shorter than max mb length)
next prev parent reply other threads:[~2015-06-17 9:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 2:48 Josiah Worcester
2015-06-17 9:30 ` Szabolcs Nagy [this message]
2015-06-17 19:07 ` Josiah Worcester
2015-06-18 0:40 ` Rich Felker
2015-06-20 20:32 ` Rich Felker
2015-08-30 23:14 ` Rich Felker
2015-08-31 1:10 ` Isaac Dunham
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=20150617093056.GD22285@port70.net \
--to=nsz@port70.net \
--cc=josiahw@gmail.com \
--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).