Add missing __syscall_ret in dl_mmap

Submitted by Ilya Matveychikov on Feb. 9, 2019, 1:34 p.m.

Details

Message ID DAE287BF-0962-4B40-9711-716E5738D0F2@gmail.com
State New
Series "Add missing __syscall_ret in dl_mmap"
Headers show

Commit Message

Ilya Matveychikov Feb. 9, 2019, 1:34 p.m.
Signed-off-by: Ilya V. Matveychikov <matvejchikov@gmail.com>
---
 ldso/dynlink.c | 1 +
 1 file changed, 1 insertion(+)

--
2.7.4

Patch hide | download patch | download mbox

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;
 }


Comments

Rich Felker Feb. 9, 2019, 2:35 p.m.
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