From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by sourceware.org (Postfix) with ESMTPS id DD6F23858D3C for ; Thu, 5 May 2022 01:40:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD6F23858D3C Received: from canpemm500006.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4KtxFw5yHJzhYFq; Thu, 5 May 2022 09:39:48 +0800 (CST) Received: from [10.67.110.83] (10.67.110.83) by canpemm500006.china.huawei.com (7.192.105.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 5 May 2022 09:40:10 +0800 Subject: Re: [PATCH 4/4] clock_settime/clock_gettime: Use __nonnull to avoid null pointer To: Siddhesh Poyarekar , , , , , , CC: , References: <20220428122529.108208-1-nixiaoming@huawei.com> <20220428122529.108208-5-nixiaoming@huawei.com> <932bcc36-9832-4701-b468-c4071db7dd1a@gotplt.org> From: Xiaoming Ni Message-ID: <61830dcd-20d3-f16e-ea62-4dfefc13820c@huawei.com> Date: Thu, 5 May 2022 09:39:42 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.0.1 MIME-Version: 1.0 In-Reply-To: <932bcc36-9832-4701-b468-c4071db7dd1a@gotplt.org> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.67.110.83] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To canpemm500006.china.huawei.com (7.192.105.130) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, BODY_8BITS, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_MANYTO, NICE_REPLY_A, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 May 2022 01:40:16 -0000 On 2022/5/4 19:02, Siddhesh Poyarekar wrote: > On 28/04/2022 17:55, Xiaoming Ni via Libc-alpha wrote: >> 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 >> --- >>   include/time.h | 4 ++-- >>   time/time.h    | 9 ++++++--- >>   2 files changed, 8 insertions(+), 5 deletions(-) >> >> diff --git a/include/time.h b/include/time.h >> index 127347eb90..a64eff54f5 100644 >> --- a/include/time.h >> +++ b/include/time.h >> @@ -166,7 +166,7 @@ libc_hidden_proto (__timegm64) >>   # define __clock_settime64 __clock_settime >>   #else >>   extern int __clock_settime64 (clockid_t clock_id, >> -                              const struct __timespec64 *tp); >> +                              const struct __timespec64 *tp) >> __nonnull((2)); >>   libc_hidden_proto (__clock_settime64) >>   #endif >> @@ -324,7 +324,7 @@ extern int __clock_nanosleep_time64 (clockid_t >> clock_id, >>                                        int flags, const struct >> __timespec64 *req, >>                                        struct __timespec64 *rem); >>   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) >>   extern int __timespec_get64 (struct __timespec64 *ts, int base); >>   libc_hidden_proto (__timespec_get64) >> diff --git a/time/time.h b/time/time.h >> index 847ac3f8c0..26f276f147 100644 >> --- a/time/time.h >> +++ b/time/time.h >> @@ -276,11 +276,12 @@ extern int nanosleep (const struct timespec >> *__requested_time, >>   extern int clock_getres (clockid_t __clock_id, struct timespec >> *__res) __THROW; >>   /* 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.  */ >>   extern int clock_settime (clockid_t __clock_id, const struct >> timespec *__tp) >> -     __THROW; >> +     __THROW __nonnull((2)); >>   # else >>   #  ifdef __REDIRECT >>   extern int __REDIRECT (nanosleep, (const struct timespec >> *__requested_time, >> @@ -291,8 +292,10 @@ extern int __REDIRECT_NTH (clock_getres, >> (clockid_t __clock_id, >>                              __clock_getres64); >>   extern int __REDIRECT_NTH (clock_gettime, (clockid_t __clock_id, struct >>                                              timespec *__tp), >> __clock_gettime64); > > The semicolon at the end needs to go away.  This was also caught by > patchwork trybot: > > https://patchwork.sourceware.org/project/glibc/patch/20220428122529.108208-5-nixiaoming@huawei.com/ > > https://www.delorie.com/trybots/32bit/8846/make.tail.txt > Thanks, I'll fix it later on v2. >> +                           __nonnull((2)); >>   extern int __REDIRECT_NTH (clock_settime, (clockid_t __clock_id, >> const struct >> -                                           timespec *__tp), >> __clock_settime64); >> +                                           timespec *__tp), >> __clock_settime64) >> +                           __nonnull((2)); >>   #  else >>   #   define nanosleep __nanosleep64 >>   #   define clock_getres __clock_getres64 > > .