From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH] time: Also check for EPERM while trying to clock_settime
Date: Fri, 2 Jun 2023 14:02:09 -0300 [thread overview]
Message-ID: <20230602170209.33275-1-adhemerval.zanella@linaro.org> (raw)
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.
---
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>
--
2.34.1
next reply other threads:[~2023-06-02 17:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 17:02 Adhemerval Zanella [this message]
2023-06-03 2:08 ` Carlos O'Donell
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=20230602170209.33275-1-adhemerval.zanella@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/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.
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).