lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

clock_settime/clock_gettime: Use __nonnull to avoid null pointer

Browse Source 
clock_settime()
clock_settime64()
clock_gettime()
clock_gettime64()
Add __nonnull((2)) to avoid null pointer access.

Link: https://sourceware.org/bugzilla/show_bug.cgi?id=27662
Link: https://sourceware.org/bugzilla/show_bug.cgi?id=29084
Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Xiaoming Ni
2022-05-05 11:01:11 +08:00
committed by Siddhesh Poyarekar
parent ed2ddeffa5
commit cf73acb596
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/time.h
View File

@@ -166,7 +166,7 @@ libc_hidden_proto (__timegm64)
# define __clock_settime64 __clock_settime # define __clock_settime64 __clock_settime
#else #else
extern int __clock_settime64 (clockid_t clock_id, extern int __clock_settime64 (clockid_t clock_id,
const struct __timespec64 *tp); const struct __timespec64 *tp) __nonnull((2));
libc_hidden_proto (__clock_settime64) libc_hidden_proto (__clock_settime64)
#endif #endif
@@ -324,7 +324,7 @@ extern int __clock_nanosleep_time64 (clockid_t clock_id,
int flags, const struct __timespec64 *req, int flags, const struct __timespec64 *req,
struct __timespec64 *rem); struct __timespec64 *rem);
libc_hidden_proto (__clock_nanosleep_time64) libc_hidden_proto (__clock_nanosleep_time64)
extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp); extern int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp) __nonnull((2));
libc_hidden_proto (__clock_gettime64) libc_hidden_proto (__clock_gettime64)
extern int __timespec_get64 (struct __timespec64 *ts, int base); extern int __timespec_get64 (struct __timespec64 *ts, int base);
libc_hidden_proto (__timespec_get64) libc_hidden_proto (__timespec_get64)

11
time/time.h
View File

@@ -276,11 +276,12 @@ extern int nanosleep (const struct timespec *__requested_time,
extern int clock_getres (clockid_t __clock_id, struct timespec *__res) __THROW; extern int clock_getres (clockid_t __clock_id, struct timespec *__res) __THROW;
/* Get current value of clock CLOCK_ID and store it in TP. */ /* Get current value of clock CLOCK_ID and store it in TP. */
extern int clock_gettime (clockid_t __clock_id, struct timespec *__tp) __THROW; extern int clock_gettime (clockid_t __clock_id, struct timespec *__tp)
__THROW __nonnull((2));
/* Set clock CLOCK_ID to value TP. */ /* Set clock CLOCK_ID to value TP. */
extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp) extern int clock_settime (clockid_t __clock_id, const struct timespec *__tp)
__THROW; __THROW __nonnull((2));
# else # else
# ifdef __REDIRECT # ifdef __REDIRECT
extern int __REDIRECT (nanosleep, (const struct timespec *__requested_time, extern int __REDIRECT (nanosleep, (const struct timespec *__requested_time,
@@ -290,9 +291,11 @@ extern int __REDIRECT_NTH (clock_getres, (clockid_t __clock_id,
struct timespec *__res), struct timespec *__res),
__clock_getres64); __clock_getres64);
extern int __REDIRECT_NTH (clock_gettime, (clockid_t __clock_id, struct extern int __REDIRECT_NTH (clock_gettime, (clockid_t __clock_id, struct
timespec *__tp), __clock_gettime64); timespec *__tp), __clock_gettime64)
__nonnull((2));
extern int __REDIRECT_NTH (clock_settime, (clockid_t __clock_id, const struct extern int __REDIRECT_NTH (clock_settime, (clockid_t __clock_id, const struct
timespec *__tp), __clock_settime64); timespec *__tp), __clock_settime64)
__nonnull((2));
# else # else
# define nanosleep __nanosleep64 # define nanosleep __nanosleep64
# define clock_getres __clock_getres64 # define clock_getres __clock_getres64