diff mbox

misc/sbrk.c: Set errno to ENOMEM on overflow.

Message ID 20150520115000.GA5495@rei.suse.de
State New
Headers show

Commit Message

Cyril Hrubis May 20, 2015, 11:50 a.m. UTC 
---
 ChangeLog   |  4 ++++
 misc/sbrk.c | 13 +++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

Comments

Cyril Hrubis June 8, 2015, 9:44 a.m. UTC | #1 
PING?
> ---
>  ChangeLog   |  4 ++++
>  misc/sbrk.c | 13 +++++++++----
>  2 files changed, 13 insertions(+), 4 deletions(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index c1a73c8..252af8e 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,7 @@
> +2015-05-20  Cyril Hrubis <chrubis@suse.cz>
> +
> +	* misc/sbrk.c: Set errno to ENOMEM on overflow.
> +
>  2015-05-19  Joseph Myers  <joseph@codesourcery.com>
>  
>  	[BZ #18244]
> diff --git a/misc/sbrk.c b/misc/sbrk.c
> index 87b5472..89ab9c4 100644
> --- a/misc/sbrk.c
> +++ b/misc/sbrk.c
> @@ -47,10 +47,15 @@ __sbrk (intptr_t increment)
>      return __curbrk;
>  
>    oldbrk = __curbrk;
> -  if ((increment > 0
> -       ? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
> -       : ((uintptr_t) oldbrk < (uintptr_t) -increment))
> -      || __brk (oldbrk + increment) < 0)
> +  if (increment > 0
> +      ? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
> +      : ((uintptr_t) oldbrk < (uintptr_t) -increment))
> +    {
> +      __set_errno (ENOMEM);
> +      return (void *) -1;
> +    }
> +
> +  if (__brk (oldbrk + increment) < 0)
>      return (void *) -1;
>  
>    return oldbrk;
Andreas Schwab June 8, 2015, 11:41 a.m. UTC | #2 
Yes, this is ok.

Andreas.
Cyril Hrubis June 22, 2015, 1:35 p.m. UTC | #3 
Hi!
> Yes, this is ok.

Can anyone apply this then?
Andreas Schwab June 22, 2015, 2:03 p.m. UTC | #4 
Sorry for failing to mention it earlier: please file a bugzilla entry,
since it is fixing a user-visible bug.

Andreas.
Cyril Hrubis June 24, 2015, 12:12 p.m. UTC | #5 
Hi!
> Sorry for failing to mention it earlier: please file a bugzilla entry,
> since it is fixing a user-visible bug.

https://sourceware.org/bugzilla/show_bug.cgi?id=18592
Cyril Hrubis July 2, 2015, 11:31 a.m. UTC | #6 
Hi!
> > Sorry for failing to mention it earlier: please file a bugzilla entry,
> > since it is fixing a user-visible bug.
> 
> https://sourceware.org/bugzilla/show_bug.cgi?id=18592

Ping?
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index c1a73c8..252af8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@ 
+2015-05-20  Cyril Hrubis <chrubis@suse.cz>
+
+	* misc/sbrk.c: Set errno to ENOMEM on overflow.
+
 2015-05-19  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #18244]
diff --git a/misc/sbrk.c b/misc/sbrk.c
index 87b5472..89ab9c4 100644
--- a/misc/sbrk.c
+++ b/misc/sbrk.c
@@ -47,10 +47,15 @@  __sbrk (intptr_t increment)
     return __curbrk;
 
   oldbrk = __curbrk;
-  if ((increment > 0
-       ? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
-       : ((uintptr_t) oldbrk < (uintptr_t) -increment))
-      || __brk (oldbrk + increment) < 0)
+  if (increment > 0
+      ? ((uintptr_t) oldbrk + (uintptr_t) increment < (uintptr_t) oldbrk)
+      : ((uintptr_t) oldbrk < (uintptr_t) -increment))
+    {
+      __set_errno (ENOMEM);
+      return (void *) -1;
+    }
+
+  if (__brk (oldbrk + increment) < 0)
     return (void *) -1;
 
   return oldbrk;