From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dog.birch.relay.mailchannels.net (dog.birch.relay.mailchannels.net [23.83.209.48]) by sourceware.org (Postfix) with ESMTPS id 96D1F3858016 for ; Wed, 4 May 2022 10:59:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 96D1F3858016 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B6584560E9A; Wed, 4 May 2022 10:59:27 +0000 (UTC) Received: from pdx1-sub0-mail-a305.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 9E5FD561012; Wed, 4 May 2022 10:59:26 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1651661966; a=rsa-sha256; cv=none; b=PJ8CIfKqNGO6kUStEKhD/+LQPYEaGd7P+lH5Htvw4kV8lBMToX+urdQdnELRpMdTJm4+67 YIMqYnkHNuSLSIEZ2WXP1PNosjW18pA9VrJcc9N6MLqLHax44k9h56w01vFpYowd6Lt5wE /TEazq5TXE2COTAaNI0s8M59DWkOBEn5b7KBf+6SCox99lOvRaBLOn+BoG2MLUhVrZMq4t 6kyuO4BgLwsqPahDT2d/rHFCpmiR0DllxDenq/140G4aLyrugM6QcivDFBygbG9n6qwiBF 4bMf9CquZxHfmHmHfdvkK0zGHNsJ/fYqiICuAhHw6VHYyjuwEPZocdPzjZqGow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1651661966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=2CpS2IktuvJU3aX4NOrsoj2bDmn3pc/Qi+F5NfAl8bM=; b=EHBuBjkmpUmgrS2n0Ocj76ZeTJZ2YsvLCvGPGW2eZlYRlz/fMf4Ah/1SINkrUugfpUJnTk vHUVUHgKOR/8isn4qBkToBX8ztWM0by9rTwZ4/oooafsnUKRIz1F8KLTNEw76cTq3bTgVL btl/nMGU+O5pD/8IujH7rGjhWAXPlRiBJrhkJp9gfb7p6h09ml6iAH+cmmesVfRBcPYOGw esZMQTRBECC+mxicUwI2ZrNd+C2trs5QLfeS1r+3ihoLFh3cRCqwy7/FXLtnkwAH4YlkK/ eyzUh8qM8c4vfyGtOnBuO9I/puEMJJf4t41yMSNKmwZ+KBHN1dN2TakZIvphDw== ARC-Authentication-Results: i=1; rspamd-847dd8955c-qcpmh; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Scare-Whimsical: 592bd21d05e75508_1651661967592_2307546847 X-MC-Loop-Signature: 1651661967592:3423873531 X-MC-Ingress-Time: 1651661967592 Received: from pdx1-sub0-mail-a305.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.101.255.170 (trex/6.7.1); Wed, 04 May 2022 10:59:27 +0000 Received: from [192.168.1.174] (unknown [1.186.223.145]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a305.dreamhost.com (Postfix) with ESMTPSA id 4KtYk22k9Zz24; Wed, 4 May 2022 03:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1651661966; bh=2CpS2IktuvJU3aX4NOrsoj2bDmn3pc/Qi+F5NfAl8bM=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=RAMn3sWKWiqbtOzARUFRAExm5qUniOvkmt0hCtMwxL9dT4OmzoBKutqp6n9O+eU17 qIqJ5qLRULMt0pOmg8HQ5TuVHdP1654gUr+DuUVJb6tmwX32/dUXIkTEu2WrFymzhj ISCEjvvMZag88ZY8alDiMdTwUw3s8YefMb9mk4o0FR5f0NMUPFuTvSrDmHvPHATc7A kyyoSF6uPPEEcuKZ27fwc6WykJs/sKKmSGgfTywu8PngcwskmIncjutRdWG+ZWLZk9 a/bUDRdjf5hgQ7RHWzGG4+roM5TD1wScmsTedEy4pkCfGHDzhlSmtreOrtTmmJYH7t WmShDA1L6binQ== Message-ID: <0d5edd57-ecae-2a4e-b553-b0f5596d8b40@gotplt.org> Date: Wed, 4 May 2022 16:29:17 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH 2/4] ntp_xxxtimex: Use __nonnull to avoid null pointer Content-Language: en-US To: Xiaoming Ni , drepper@redhat.com, lukma@denx.de, adrian.ratiu@collabora.com, schwab@linux-m68k.org, fweimer@redhat.com, adhemerval.zanella@linaro.org Cc: libc-alpha@sourceware.org, wangle6@huawei.com References: <20220428122529.108208-1-nixiaoming@huawei.com> <20220428122529.108208-3-nixiaoming@huawei.com> From: Siddhesh Poyarekar In-Reply-To: <20220428122529.108208-3-nixiaoming@huawei.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3038.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, 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: Wed, 04 May 2022 10:59:31 -0000 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 > --- LGTM. Reviewed-by: Siddhesh Poyarekar > 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