public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] time: Also check for EPERM while trying to clock_settime
@ 2023-06-05 15:53 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2023-06-05 15:53 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e3622a8f391deea3b75a577dce70d023dfa3f1c7
commit e3622a8f391deea3b75a577dce70d023dfa3f1c7
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri Jun 2 14:02:09 2023 -0300
time: Also check for EPERM while trying to clock_settime
Container management default seccomp filter [1] only accepts
clock_settime if process has also CAP_SYS_TIME. So also handle
EPERM as well.
Also adapt the test to libsupport and add a proper Copyright header.
Checked on aarch64-linux-gnu.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diff:
---
time/tst-clock2.c | 59 ++++++++++++++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 29 deletions(-)
diff --git a/time/tst-clock2.c b/time/tst-clock2.c
index 4c8fb9f247..9d1980e858 100644
--- a/time/tst-clock2.c
+++ b/time/tst-clock2.c
@@ -1,43 +1,44 @@
-/* Test setting the monotonic clock. */
+/* Test setting the monotonic clock.
+ Copyright (C) 2007-2023 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
-#include <time.h>
-#include <unistd.h>
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
-#if defined CLOCK_MONOTONIC && defined _POSIX_MONOTONIC_CLOCK
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
-# include <errno.h>
-# include <stdio.h>
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <support/check.h>
+#include <time.h>
+#include <unistd.h>
-static int
+int
do_test (void)
{
+#if defined CLOCK_MONOTONIC && defined _POSIX_MONOTONIC_CLOCK
if (sysconf (_SC_MONOTONIC_CLOCK) <= 0)
- return 0;
+ FAIL_UNSUPPORTED ("_SC_MONOTONIC_CLOCK not supported");
struct timespec ts;
- if (clock_gettime (CLOCK_MONOTONIC, &ts) != 0)
- {
- puts ("clock_gettime(CLOCK_MONOTONIC) failed");
- return 1;
- }
+ TEST_COMPARE (clock_gettime (CLOCK_MONOTONIC, &ts), 0);
/* Setting the monotonic clock must fail. */
- if (clock_settime (CLOCK_MONOTONIC, &ts) != -1)
- {
- puts ("clock_settime(CLOCK_MONOTONIC) did not fail");
- return 1;
- }
- if (errno != EINVAL)
- {
- printf ("clock_settime(CLOCK_MONOTONIC) set errno to %d, expected %d\n",
- errno, EINVAL);
- return 1;
- }
- return 0;
-}
-# define TEST_FUNCTION do_test ()
+ TEST_VERIFY (clock_settime (CLOCK_MONOTONIC, &ts) == -1);
+ TEST_VERIFY (errno == EINVAL || errno == EPERM);
+ return 0;
#else
-# define TEST_FUNCTION 0
+ return EXIT_UNSUPPORTED;
#endif
-#include "../test-skeleton.c"
+}
+
+#include <support/test-driver.c>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-06-05 15:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-05 15:53 [glibc] time: Also check for EPERM while trying to clock_settime Adhemerval Zanella
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 read-only IMAP folder(s) and NNTP newsgroup(s).