mailing list of musl libc
 help / color / mirror / code / Atom feed
From: Szabolcs Nagy <nsz@port70.net>
To: musl@lists.openwall.com
Subject: linux/sbrk is wrong
Date: Sun, 22 May 2011 16:55:55 +0200	[thread overview]
Message-ID: <20110522145555.GE6142@port70.net> (raw)

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

linux brk syscall returns the end pointer
so if it fails then the old one
if it succeeds then the new one

the current implementation of sbrk returns
the end of the allocated area instead of
the begining

i attached a patch that fixes brk and sbrk

[-- Attachment #2: sbrk.diff --]
[-- Type: text/x-diff, Size: 647 bytes --]

diff --git a/src/linux/brk.c b/src/linux/brk.c
index 9f63c5a..c261518 100644
--- a/src/linux/brk.c
+++ b/src/linux/brk.c
@@ -2,5 +2,5 @@
 
 int brk(void *end)
 {
-	return -(syscall(SYS_brk, end) == -1);
+	return -((void *)syscall(SYS_brk, end) != end);
 }
diff --git a/src/linux/sbrk.c b/src/linux/sbrk.c
index b2943a9..478a35e 100644
--- a/src/linux/sbrk.c
+++ b/src/linux/sbrk.c
@@ -3,5 +3,11 @@
 
 void *sbrk(ptrdiff_t inc)
 {
-	return (void *)syscall(SYS_brk, syscall(SYS_brk, 0)+inc);
+	void *p = (void *)syscall(SYS_brk, 0);
+
+	if (inc == 0)
+		return p;
+	if ((void *)syscall(SYS_brk, p+inc) == p+inc)
+		return p;
+	return (void *)-1;
 }

             reply	other threads:[~2011-05-22 14:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-22 14:55 Szabolcs Nagy [this message]
2011-05-22 16:09 ` 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=20110522145555.GE6142@port70.net \
    --to=nsz@port70.net \
    --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).