RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:27:45 +00:00
Code Issues Activity Actions

LibC: Add nanosleep() wrapper around clock_nanosleep(CLOCK_REALTIME)

Browse source 
Gets rid of one dropbear patch. :^)
This commit is contained in:
Andreas Kling 2020-06-08 21:53:41 +02:00
parent 57b6f51137
commit c88ea2f54a
3 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Libraries/LibC/time.cpp
View file

@ -330,6 +330,11 @@ int clock_nanosleep(clockid_t clock_id, int flags, const struct timespec* reques
__RETURN_WITH_ERRNO(rc, rc, -1); __RETURN_WITH_ERRNO(rc, rc, -1);
} }
int nanosleep(const struct timespec* requested_sleep, struct timespec* remaining_sleep)
{
return clock_nanosleep(CLOCK_REALTIME, 0, requested_sleep, remaining_sleep);
}
int clock_getres(clockid_t, struct timespec*) int clock_getres(clockid_t, struct timespec*)
{ {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();

1
Libraries/LibC/time.h
View file

@ -77,6 +77,7 @@ int clock_gettime(clockid_t, struct timespec*);
int clock_settime(clockid_t, struct timespec*); int clock_settime(clockid_t, struct timespec*);
int clock_nanosleep(clockid_t, int flags, const struct timespec* requested_sleep, struct timespec* remaining_sleep); int clock_nanosleep(clockid_t, int flags, const struct timespec* requested_sleep, struct timespec* remaining_sleep);
int clock_getres(clockid_t, struct timespec* result); int clock_getres(clockid_t, struct timespec* result);
int nanosleep(const struct timespec* requested_sleep, struct timespec* remaining_sleep);
struct tm* gmtime_r(const time_t* timep, struct tm* result); struct tm* gmtime_r(const time_t* timep, struct tm* result);
struct tm* localtime_r(const time_t* timep, struct tm* result); struct tm* localtime_r(const time_t* timep, struct tm* result);

11
Ports/dropbear/patches/remove-nanosleep.patch
View file

@ -1,11 +0,0 @@
Hinders security by a little, but I guess we'll just have nanosleep soon enough.
--- a/svr-auth.c.orig
+++ b/svr-auth.c
@@ -424,7 +424,6 @@
if (!fuzz.fuzzing)
#endif
{
- while (nanosleep(&delay, &delay) == -1 && errno == EINTR) { /* Go back to sleep */ }
}
ses.authstate.failcount++;