From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/13738 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Ilya Matveychikov Newsgroups: gmane.linux.lib.musl.general Subject: [PATCH] Fix the use of syscall result in dl_mmap Date: Sat, 9 Feb 2019 18:56:17 +0400 Message-ID: <915E241F-3931-49F5-88C6-17888CBE5022@gmail.com> References: Reply-To: musl@lists.openwall.com Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="142833"; mail-complaints-to="usenet@blaine.gmane.org" Cc: dalias@glibc.org To: musl@lists.openwall.com Original-X-From: musl-return-13754-gllmg-musl=m.gmane.org@lists.openwall.com Sat Feb 09 15:56:38 2019 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.89) (envelope-from ) id 1gsU3W-000b1A-IT for gllmg-musl@m.gmane.org; Sat, 09 Feb 2019 15:56:34 +0100 Original-Received: (qmail 1427 invoked by uid 550); 9 Feb 2019 14:56:32 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 1387 invoked from network); 9 Feb 2019 14:56:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ss3OeQaUgPjDkWBhxBg1UNZDFkXd3h05P7jEAYgca9Q=; b=kgcgDOM2SiAriTUBH4blsTrAXRAvz8Y63y+WcDIN5wdTGj2K7NRTzZIY0tarcL43Rl TahDooQUO0/tIiw27zpR0WKLtL7e4FpBlINF708G+svt/AiXviYWKck6YN40BrqXPHOh VMSm4uv8ehTo04CWRKZ3Whdl+bnRULIxblrGXtm9TbQvRRM/ONTMwHLBS2MHdAE9vzrG sfHDsFUf4gUDm1mBHSSW8shB6+jYVppCDXWazSDVonBLLGs0T0H8BJddIn7CNZ5/WUq9 2tiFdRp9Sr1+d9D2ANjymFxvHYQgGfWDU4zlTFOTdLaRKGxA9btBZ7WXYX1zbQf5N4UC u4Hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ss3OeQaUgPjDkWBhxBg1UNZDFkXd3h05P7jEAYgca9Q=; b=VmJHT6ZVbIBwuVMMGwa7KX0ROWqmhZjExoKe3aq24LIjoZxNyWriH0szHbfZvpy1Ps DEWJKWP7YvZeRnkctaLIs5ngTXNZ5hqINSuy06SoMtbsA8Tpc/iWsbNcaDd+Jcaiq51S 7sngN2Bo5u4xtS0PQFcJn/pkhah5A0smx10KrwhShwWU+QFZF7lXMvT4/ugpVQRzDVsS VZWaVTt45MyYJktrTc/fX1JDevSdmj/GVCJCEyXv11YLC8NO7jgeA9PwIAiayQVPQOkW SG3hPGQgk8DRvc34hjH8iP0iGSpv/Vy3ENvlMsdobdEI/lo5w1WhO4DI5Qy7UbxcvNsX NmgQ== X-Gm-Message-State: AHQUAuYXOfQkHh/Ma2H3QT9kY1PDmI0qqOx8Hk6EkBt9YM2hkUkj+wb6 AKHj3MR1LyW2hvVqbL4DJj0v8cGl X-Google-Smtp-Source: AHgI3IZsgPrBouBik194xm1CIbDzZhXQ+kn6yxHrFX/ApjNVnDB7g659lGYpzSHMcBG+GQjkiUU1jA== X-Received: by 2002:adf:8919:: with SMTP id s25mr20458093wrs.38.1549724180214; Sat, 09 Feb 2019 06:56:20 -0800 (PST) In-Reply-To: X-Mailer: Apple Mail (2.3445.102.3) Xref: news.gmane.org gmane.linux.lib.musl.general:13738 Archived-At: 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 Signed-off-by: Ilya V. Matveychikov --- 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 =3D (void *)__syscall(SYS_mmap, 0, n, prot, flags, -1, 0); #endif - return p =3D=3D MAP_FAILED ? 0 : p; + return (unsigned long)p > -4096UL ? 0 : p; } static void makefuncdescs(struct dso *p) =E2=80=94 2.7.4 > On Feb 9, 2019, at 5:34 PM, Ilya Matveychikov = wrote: >=20 > Signed-off-by: Ilya V. Matveychikov > --- > ldso/dynlink.c | 1 + > 1 file changed, 1 insertion(+) >=20 > 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 =3D (void *)__syscall(SYS_mmap, 0, n, prot, flags, -1, 0); > #endif > + p =3D (void *)__syscall_ret((unsigned long)p); > return p =3D=3D MAP_FAILED ? 0 : p; > } >=20 > -- > 2.7.4 >=20