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

adjtimex/adjtimex64: Use __nonnull to avoid null pointer

Browse Source 
Add __nonnull((1)) to the adjtimex()/adjtimex64() function declaration
    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:08 +08:00
committed by Siddhesh Poyarekar
parent eff158b75d
commit d62a70fda8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/unix/sysv/linux/include/sys/timex.h
View File

@ -23,7 +23,7 @@
# ifndef _ISOMAC # ifndef _ISOMAC
extern int __adjtimex (struct timex *__ntx); extern int __adjtimex (struct timex *__ntx) __nonnull ((1));
libc_hidden_proto (__adjtimex) libc_hidden_proto (__adjtimex)
# include <time.h> # include <time.h>
@ -79,7 +79,7 @@ struct __timex64
}; };
extern int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64); extern int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64);
libc_hidden_proto (__clock_adjtime64); libc_hidden_proto (__clock_adjtime64);
extern int ___adjtimex64 (struct __timex64 *tx64); extern int ___adjtimex64 (struct __timex64 *tx64) __nonnull ((1));
libc_hidden_proto (___adjtimex64) libc_hidden_proto (___adjtimex64)
struct __ntptimeval64 struct __ntptimeval64

4
sysdeps/unix/sysv/linux/sys/timex.h
View File

@ -55,7 +55,7 @@ struct ntptimeval
__BEGIN_DECLS __BEGIN_DECLS
#ifndef __USE_TIME_BITS64 #ifndef __USE_TIME_BITS64
extern int adjtimex (struct timex *__ntx) __THROW; extern int adjtimex (struct timex *__ntx) __THROW __nonnull ((1));
extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW; extern int ntp_gettimex (struct ntptimeval *__ntv) __THROW;
# ifdef __REDIRECT_NTH # ifdef __REDIRECT_NTH
@ -68,7 +68,7 @@ extern int ntp_adjtime (struct timex *__tntx) __THROW;
#else #else
# ifdef __REDIRECT_NTH # ifdef __REDIRECT_NTH
extern int __REDIRECT_NTH (adjtimex, (struct timex *__ntx), extern int __REDIRECT_NTH (adjtimex, (struct timex *__ntx),
___adjtimex64); ___adjtimex64) __nonnull ((1));
extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv),
__ntp_gettime64); __ntp_gettime64);
extern int __REDIRECT_NTH (ntp_gettimex, (struct ntptimeval *__ntv), extern int __REDIRECT_NTH (ntp_gettimex, (struct ntptimeval *__ntv),