From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: [PATCH] Add missing __syscall_ret in dl_mmap
Date: Sat, 9 Feb 2019 09:35:45 -0500 [thread overview]
Message-ID: <20190209143545.GY23599@brightrain.aerifal.cx> (raw)
In-Reply-To: <DAE287BF-0962-4B40-9711-716E5738D0F2@gmail.com>
On Sat, Feb 09, 2019 at 05:34:02PM +0400, Ilya Matveychikov wrote:
> Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>
> ---
> ldso/dynlink.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/ldso/dynlink.c b/ldso/dynlink.c
> index ec921df..329b42a 100644
> --- a/ldso/dynlink.c
> +++ b/ldso/dynlink.c
> @@ -904,6 +904,7 @@ static void *dl_mmap(size_t n)
> #else
> p = (void *)__syscall(SYS_mmap, 0, n, prot, flags, -1, 0);
> #endif
> + p = (void *)__syscall_ret((unsigned long)p);
> return p == MAP_FAILED ? 0 : p;
> }
I think you're right that the calling code expects dl_mmap to return
0, not a negative error code cast to an invalid pointer, on failure.
However the change above is wrong. The whole reason the dl_mmap
function exists is that it's used at a point at which non-static
function calls can't be made (technically, calls to hidden functions
probably work but it's not a property that we rely on), and at which
accessing TLS (and thus errno in the error path) is not yet possible.
The right fix would probably be something like:
return (uintptr_t)p > -4096 ? 0 : p;
Out of curiousity, how did you come across this?
Rich
next prev parent reply other threads:[~2019-02-09 14:35 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-09 13:34 Ilya Matveychikov
2019-02-09 14:35 ` Rich Felker [this message]
2019-02-09 14:56 ` [PATCH] Fix the use of syscall result " Ilya Matveychikov
2019-04-06 13:40 ` 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=20190209143545.GY23599@brightrain.aerifal.cx \
--to=dalias@libc.org \
--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).