From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from butterfly.birch.relay.mailchannels.net (butterfly.birch.relay.mailchannels.net [23.83.209.27]) by sourceware.org (Postfix) with ESMTPS id 5FD523858016 for ; Wed, 4 May 2022 10:57:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5FD523858016 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 144B52A1027; Wed, 4 May 2022 10:57:00 +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 68CD62A12CC; Wed, 4 May 2022 10:56:59 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1651661819; a=rsa-sha256; cv=none; b=7UiX8pIwpatLncdsTniDRfz5kqlS8a4sUZL7HCOzaJg5zw7TO3/ef3uN41QPSJkqh5RsqY iVaFSZo1ixcMuADsiosyh5MrVK2094k72jORcaXHQNAj52wURVrbf/NbWQUdJeIGZdcwyr FzOltRIyOLBcnB44eEz5B5cwgtZ7S+bYnEWHqQIwhI6Xadrd7dYvVJm830vr9swh4Bb6ZR wMM/ll3vQi+gac8C9AiLdhSJU5O1rKR1uriqjLEBTMOWG6BvF5GlIh+9ojukRB94S7i6oh YQgJCnWf6Vvd1LBL5fzkAt0B+MQwpgi0hoJf86EoeXpVsLe6TRIAxh27CTw7Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1651661819; 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=j+Db85V0Lcv+TeXYyAGJieuZpOpW8PtO4y9Uuai9rk0=; b=w/p+WAYdpBXqlmmdeg9+5RJXwRqrsxEMNDsXAJNtQ1FvJRQIGHlOLVBL8sBtb3KL3vjPw6 OJsN5anDvsd+j28hS8b73UXOuYyhrB7TFLzRHGsmWs/HNUg6LQhUJlu2YCzuAu/cZ+gu7O WNYLg2+H4vmQxs4OheqI/dC+Vs5UizHjdVZjJjqRItxoKy6ymQdg0AOAxbViM9wbqNAV1s sXiSstAqZ9i+Sp0r12ZrMebeqhPLjYJfIEoI8m2C9zETPkgzDdkarPo7SYnhuzvWDcrzcW 7OGhnubCYBX4LuAC8OCtSCEGdcRQvrsZxQVIbw5UvLvfyK+gBI5eCuKvcy3nRQ== ARC-Authentication-Results: i=1; rspamd-fdd564cbf-zwwjj; 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-Obese-Trade: 3703d4a432b98e8b_1651661819830_1062084135 X-MC-Loop-Signature: 1651661819830:181409838 X-MC-Ingress-Time: 1651661819830 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.113.195.97 (trex/6.7.1); Wed, 04 May 2022 10:56:59 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a305.dreamhost.com (Postfix) with ESMTPSA id 4KtYgC5NJQz24; Wed, 4 May 2022 03:56:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1651661819; bh=j+Db85V0Lcv+TeXYyAGJieuZpOpW8PtO4y9Uuai9rk0=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=L+yJ/gboVl05tiYwSLbY0bfARJLa5iilrbHqJQ5wP9p+YQtf6ck83q7bJ5lqGjZLi wOJ2Ntbz9JQ1p595pMRAgr4+uFAmjO9XcsyP3ia80SfyhXLq1SRih7NasKPPPIiYUu x0Lt/mnOH05dF1pzcolWdpVZQub9hMyg2S44Xdsk3BZrn/3DvEb6RkwVd6BKXWJGOe 6DCxk9iJmQdJ8eIAuxPSFbfZGZ7y9Ar66U1dF32ZRUXLQTphH43Sd22yltiKljhWW5 dL7aAFVbC5Tqye66IKRE3q/edel6rvn9NsELyr6t/6nanGKxHcBQM3OV71YtS0HJte XmneLgtl2rbtg== Message-ID: <57479b3f-5ab5-693e-4a3f-c689875c1d6f@gotplt.org> Date: Wed, 4 May 2022 16:26:50 +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 1/4] adjtimex/adjtimex64: 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-2-nixiaoming@huawei.com> From: Siddhesh Poyarekar In-Reply-To: <20220428122529.108208-2-nixiaoming@huawei.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3037.9 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, RCVD_IN_MSPIKE_H2, 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:57:03 -0000 On 28/04/2022 17:55, Xiaoming Ni via Libc-alpha wrote: > 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 > --- LGTM. Reviewed-by: Siddhesh Poyarekar > sysdeps/unix/sysv/linux/include/sys/timex.h | 4 ++-- > sysdeps/unix/sysv/linux/sys/timex.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h > index 964a2c21f2..dd599b1c32 100644 > --- a/sysdeps/unix/sysv/linux/include/sys/timex.h > +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h > @@ -23,7 +23,7 @@ > > # ifndef _ISOMAC > > -extern int __adjtimex (struct timex *__ntx); > +extern int __adjtimex (struct timex *__ntx) __nonnull ((1)); > libc_hidden_proto (__adjtimex) > > # include > @@ -79,7 +79,7 @@ struct __timex64 > }; > extern int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64); > libc_hidden_proto (__clock_adjtime64); > -extern int ___adjtimex64 (struct __timex64 *tx64); > +extern int ___adjtimex64 (struct __timex64 *tx64) __nonnull ((1)); > libc_hidden_proto (___adjtimex64) > > struct __ntptimeval64 > diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h > index 60d94814e8..430e47509d 100644 > --- a/sysdeps/unix/sysv/linux/sys/timex.h > +++ b/sysdeps/unix/sysv/linux/sys/timex.h > @@ -55,7 +55,7 @@ struct ntptimeval > __BEGIN_DECLS > > #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; > > # ifdef __REDIRECT_NTH > @@ -68,7 +68,7 @@ extern int ntp_adjtime (struct timex *__tntx) __THROW; > #else > # ifdef __REDIRECT_NTH > extern int __REDIRECT_NTH (adjtimex, (struct timex *__ntx), > - ___adjtimex64); > + ___adjtimex64) __nonnull ((1)); > extern int __REDIRECT_NTH (ntp_gettime, (struct ntptimeval *__ntv), > __ntp_gettime64); > extern int __REDIRECT_NTH (ntp_gettimex, (struct ntptimeval *__ntv),