From: Xiaoming Ni <nixiaoming@huawei.com>
Date: Thu, 5 May 2022 03:01:09 +0000 (+0800)
Subject: ntp_xxxtimex: Use __nonnull to avoid null pointer
X-Git-Tag: upstream/2.36~310
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a9786b8ecf84a23f9d108a46f58e9fcca70c4a9;p=platform%2Fupstream%2Fglibc.git

ntp_xxxtimex: Use __nonnull to avoid null pointer

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>
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---

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