[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20190406134035.GQ23599@brightrain.aerifal.cx>
Date: Sat, 6 Apr 2019 09:40:35 -0400
From: Rich Felker <dalias@...bc.org>
To: Ilya Matveychikov <matvejchikov@...il.com>
Cc: musl@...ts.openwall.com
Subject: Re: [PATCH] Fix the use of syscall result in dl_mmap
On Sat, Feb 09, 2019 at 06:56:17PM +0400, Ilya Matveychikov wrote:
> Correct version of the change thanks to Rich Felker!
>
> I was not cc-ed, so here is the discussion:
> https://www.openwall.com/lists/musl/2019/02/09/2
Thanks! Sorry I overlooked this before. I'm applying it now.
Rich
> Signed-off-by: Ilya V. Matveychikov <matvejchikov@...il.com>
> ---
> ldso/dynlink.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ldso/dynlink.c b/ldso/dynlink.c
> index ec921df..76e8c06 100644
> --- a/ldso/dynlink.c
> +++ b/ldso/dynlink.c
> @@ -904,7 +904,7 @@ static void *dl_mmap(size_t n)
> #else
> p = (void *)__syscall(SYS_mmap, 0, n, prot, flags, -1, 0);
> #endif
> - return p == MAP_FAILED ? 0 : p;
> + return (unsigned long)p > -4096UL ? 0 : p;
> }
>
> static void makefuncdescs(struct dso *p)
> —
> 2.7.4
>
>
> > On Feb 9, 2019, at 5:34 PM, Ilya Matveychikov <matvejchikov@...il.com> wrote:
> >
> > Signed-off-by: Ilya V. Matveychikov <matvejchikov@...il.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;
> > }
> >
> > --
> > 2.7.4
> >
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
