| Message ID | 20220428122529.108208-3-nixiaoming@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | time: Use __nonnull to avoid null pointer | expand |
On 28/04/2022 17:55, Xiaoming Ni via Libc-alpha wrote: > ntp_gettime() > ntp_gettime64() > ntp_gettimex() > ntp_gettimex64() > ntp_adjtime() > Add __nonnull((1)) 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> > --- LGTM. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org> > sysdeps/unix/sysv/linux/include/sys/timex.h | 4 ++-- > sysdeps/unix/sysv/linux/sys/timex.h | 12 ++++++------ > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h > index dd599b1c32..9d0da60640 100644 > --- a/sysdeps/unix/sysv/linux/include/sys/timex.h > +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h > @@ -94,9 +94,9 @@ struct __ntptimeval64 > long int __glibc_reserved3; > long int __glibc_reserved4; > }; > -extern int __ntp_gettime64 (struct __ntptimeval64 *ntv); > +extern int __ntp_gettime64 (struct __ntptimeval64 *ntv) __nonnull ((1)); > libc_hidden_proto (__ntp_gettime64) > -extern int __ntp_gettimex64 (struct __ntptimeval64 *ntv); > +extern int __ntp_gettimex64 (struct __ntptimeval64 *ntv) __nonnull ((1)); > libc_hidden_proto (__ntp_gettimex64) > > # endif > diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h > index 430e47509d..1a3d2fdb8d 100644 > --- a/sysdeps/unix/sysv/linux/sys/timex.h > +++ b/sysdeps/unix/sysv/linux/sys/timex.h > @@ -56,25 +56,25 @@ __BEGIN_DECLS > > #ifndef __USE_TIME_BITS64 > 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 __nonnull ((1)); > > # ifdef __REDIRECT_NTH > extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), > - ntp_gettimex); > + ntp_gettimex) __nonnull ((1)); > # else > # define ntp_gettime ntp_gettimex > # endif > -extern int ntp_adjtime (struct timex *__tntx) __THROW; > +extern int ntp_adjtime (struct timex *__tntx) __THROW __nonnull ((1)); > #else > # ifdef __REDIRECT_NTH > extern int __REDIRECT_NTH (adjtimex, (struct timex *__ntx), > ___adjtimex64) __nonnull ((1)); > extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), > - __ntp_gettime64); > + __ntp_gettime64) __nonnull ((1)); > extern int __REDIRECT_NTH (ntp_gettimex, (struct ntptimeval *__ntv), > - __ntp_gettimex64); > + __ntp_gettimex64) __nonnull ((1)); > extern int __REDIRECT_NTH (ntp_adjtime, (struct timex *__ntx), > - ___adjtimex64); > + ___adjtimex64) __nonnull ((1)); > # else > # define adjtimex ___adjtimex64 > # define ntp_adjtime ___adjtimex64
diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h index dd599b1c32..9d0da60640 100644 --- a/sysdeps/unix/sysv/linux/include/sys/timex.h +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h @@ -94,9 +94,9 @@ struct __ntptimeval64 long int __glibc_reserved3; long int __glibc_reserved4; }; -extern int __ntp_gettime64 (struct __ntptimeval64 *ntv); +extern int __ntp_gettime64 (struct __ntptimeval64 *ntv) __nonnull ((1)); libc_hidden_proto (__ntp_gettime64) -extern int __ntp_gettimex64 (struct __ntptimeval64 *ntv); +extern int __ntp_gettimex64 (struct __ntptimeval64 *ntv) __nonnull ((1)); libc_hidden_proto (__ntp_gettimex64) # endif diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h index 430e47509d..1a3d2fdb8d 100644 --- a/sysdeps/unix/sysv/linux/sys/timex.h +++ b/sysdeps/unix/sysv/linux/sys/timex.h @@ -56,25 +56,25 @@ __BEGIN_DECLS #ifndef __USE_TIME_BITS64 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 __nonnull ((1)); # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), - ntp_gettimex); + ntp_gettimex) __nonnull ((1)); # else # define ntp_gettime ntp_gettimex # endif -extern int ntp_adjtime (struct timex *__tntx) __THROW; +extern int ntp_adjtime (struct timex *__tntx) __THROW __nonnull ((1)); #else # ifdef __REDIRECT_NTH extern int __REDIRECT_NTH (adjtimex, (struct timex *__ntx), ___adjtimex64) __nonnull ((1)); extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), - __ntp_gettime64); + __ntp_gettime64) __nonnull ((1)); extern int __REDIRECT_NTH (ntp_gettimex, (struct ntptimeval *__ntv), - __ntp_gettimex64); + __ntp_gettimex64) __nonnull ((1)); extern int __REDIRECT_NTH (ntp_adjtime, (struct timex *__ntx), - ___adjtimex64); + ___adjtimex64) __nonnull ((1)); # else # define adjtimex ___adjtimex64 # define ntp_adjtime ___adjtimex64
ntp_gettime() ntp_gettime64() ntp_gettimex() ntp_gettimex64() ntp_adjtime() Add __nonnull((1)) 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> --- sysdeps/unix/sysv/linux/include/sys/timex.h | 4 ++-- sysdeps/unix/sysv/linux/sys/timex.h | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)