|
 |
147e83 |
commit 88ed594f5d431d855256edbe7e886c8cf4b575dc
|
|
|
147e83 |
Author: Roland McGrath <roland@hack.frob.com>
|
|
|
147e83 |
Date: Tue May 19 15:04:41 2015 -0700
|
|
|
147e83 |
|
|
|
147e83 |
BZ#18434: Fix sem_post EOVERFLOW check for [!__HAVE_64B_ATOMICS].
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/Makefile
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/Makefile
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/Makefile
|
|
|
147e83 |
@@ -224,6 +224,7 @@ tests = tst-typesizes \
|
|
|
147e83 |
tst-key1 tst-key2 tst-key3 tst-key4 \
|
|
|
147e83 |
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
|
|
|
147e83 |
tst-sem8 tst-sem9 tst-sem10 tst-sem11 tst-sem12 tst-sem13 tst-sem14 \
|
|
|
147e83 |
+ tst-sem15 \
|
|
|
147e83 |
tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
|
|
|
147e83 |
tst-align tst-align2 tst-align3 \
|
|
|
147e83 |
tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/tst-sem15.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- /dev/null
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/tst-sem15.c
|
|
|
147e83 |
@@ -0,0 +1,99 @@
|
|
|
147e83 |
+/* Test for SEM_VALUE_MAX overflow detection: BZ #18434.
|
|
|
147e83 |
+ Copyright (C) 2015 Free Software Foundation, Inc.
|
|
|
147e83 |
+ This file is part of the GNU C Library.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is free software; you can redistribute it and/or
|
|
|
147e83 |
+ modify it under the terms of the GNU Lesser General Public
|
|
|
147e83 |
+ License as published by the Free Software Foundation; either
|
|
|
147e83 |
+ version 2.1 of the License, or (at your option) any later version.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ The GNU C Library is distributed in the hope that it will be useful,
|
|
|
147e83 |
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
147e83 |
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
147e83 |
+ Lesser General Public License for more details.
|
|
|
147e83 |
+
|
|
|
147e83 |
+ You should have received a copy of the GNU Lesser General Public
|
|
|
147e83 |
+ License along with the GNU C Library; if not, see
|
|
|
147e83 |
+ <http://www.gnu.org/licenses/>. */
|
|
|
147e83 |
+
|
|
|
147e83 |
+#include <errno.h>
|
|
|
147e83 |
+#include <limits.h>
|
|
|
147e83 |
+#include <semaphore.h>
|
|
|
147e83 |
+#include <stdio.h>
|
|
|
147e83 |
+#include <string.h>
|
|
|
147e83 |
+#include <unistd.h>
|
|
|
147e83 |
+
|
|
|
147e83 |
+
|
|
|
147e83 |
+static int
|
|
|
147e83 |
+do_test (void)
|
|
|
147e83 |
+{
|
|
|
147e83 |
+ sem_t s;
|
|
|
147e83 |
+
|
|
|
147e83 |
+ if (sem_init (&s, 0, SEM_VALUE_MAX))
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("sem_init: %m\n");
|
|
|
147e83 |
+ return 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+
|
|
|
147e83 |
+ int result = 0;
|
|
|
147e83 |
+
|
|
|
147e83 |
+ int value = 0xdeadbeef;
|
|
|
147e83 |
+ if (sem_getvalue (&s, &value))
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("sem_getvalue: %m\n");
|
|
|
147e83 |
+ result = 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+ else
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("sem_getvalue after init: %d\n", value);
|
|
|
147e83 |
+ if (value != SEM_VALUE_MAX)
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("\tshould be %d\n", SEM_VALUE_MAX);
|
|
|
147e83 |
+ result = 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+
|
|
|
147e83 |
+ errno = 0;
|
|
|
147e83 |
+ if (sem_post(&s) == 0)
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ puts ("sem_post at SEM_VALUE_MAX succeeded!");
|
|
|
147e83 |
+ result = 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+ else
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("sem_post at SEM_VALUE_MAX: %m (%d)\n", errno);
|
|
|
147e83 |
+ if (errno != EOVERFLOW)
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("\tshould be %s (EOVERFLOW = %d)\n",
|
|
|
147e83 |
+ strerror (EOVERFLOW), EOVERFLOW);
|
|
|
147e83 |
+ result = 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+
|
|
|
147e83 |
+ value = 0xbad1d00d;
|
|
|
147e83 |
+ if (sem_getvalue (&s, &value))
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("sem_getvalue: %m\n");
|
|
|
147e83 |
+ result = 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+ else
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("sem_getvalue after post: %d\n", value);
|
|
|
147e83 |
+ if (value != SEM_VALUE_MAX)
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("\tshould be %d\n", SEM_VALUE_MAX);
|
|
|
147e83 |
+ result = 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+
|
|
|
147e83 |
+ if (sem_destroy (&s))
|
|
|
147e83 |
+ {
|
|
|
147e83 |
+ printf ("sem_destroy: %m\n");
|
|
|
147e83 |
+ result = 1;
|
|
|
147e83 |
+ }
|
|
|
147e83 |
+
|
|
|
147e83 |
+ return result;
|
|
|
147e83 |
+}
|
|
|
147e83 |
+
|
|
|
147e83 |
+#define TEST_FUNCTION do_test ()
|
|
|
147e83 |
+#include "../test-skeleton.c"
|
|
|
147e83 |
Index: glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sem_post.c
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/nptl/sysdeps/unix/sysv/linux/sem_post.c
|
|
|
147e83 |
+++ glibc-2.17-c758a686/nptl/sysdeps/unix/sysv/linux/sem_post.c
|
|
|
147e83 |
@@ -83,14 +83,14 @@ __new_sem_post (sem_t *sem)
|
|
|
147e83 |
unsigned int v = atomic_load_relaxed (&isem->value);
|
|
|
147e83 |
do
|
|
|
147e83 |
{
|
|
|
147e83 |
- if ((v << SEM_VALUE_SHIFT) == SEM_VALUE_MAX)
|
|
|
147e83 |
+ if ((v >> SEM_VALUE_SHIFT) == SEM_VALUE_MAX)
|
|
|
147e83 |
{
|
|
|
147e83 |
__set_errno (EOVERFLOW);
|
|
|
147e83 |
return -1;
|
|
|
147e83 |
}
|
|
|
147e83 |
}
|
|
|
147e83 |
- while (!atomic_compare_exchange_weak_release (&isem->value,
|
|
|
147e83 |
- &v, v + (1 << SEM_VALUE_SHIFT)));
|
|
|
147e83 |
+ while (!atomic_compare_exchange_weak_release
|
|
|
147e83 |
+ (&isem->value, &v, v + (1 << SEM_VALUE_SHIFT)));
|
|
|
147e83 |
|
|
|
147e83 |
/* If there is any potentially blocked waiter, wake one of them. */
|
|
|
147e83 |
if ((v & SEM_NWAITERS_MASK) != 0)
|