From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from crimson.ash.relay.mailchannels.net (crimson.ash.relay.mailchannels.net [23.83.222.44]) by sourceware.org (Postfix) with ESMTPS id 3A6273858016 for ; Wed, 4 May 2022 11:00:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3A6273858016 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 8BFDF20D03; Wed, 4 May 2022 11:00:56 +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 CD285209CE; Wed, 4 May 2022 11:00:54 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1651662056; a=rsa-sha256; cv=none; b=s/KQVAps0w6NnDq71Q6fbhgE/XDfWoghtP4VH3g0ADlWH2ruCI2nKOKI3puFBz/M7cewSL 6cDGLBu7reqFOdP7flnR5NDQTZTXszcwvfAydbSCiRCCJECdfvun60pSMETJ2fA9pfXwBm S7/HAnRPlOL+NmsOJj8FeuGV7H5QLbDEkdFG7iNeRBLr0eTGceAL+Nejp0brrxYPJ852OS HcUXFmdvj1VRD9Zr28KsUvgytVz1cbtWzhKRrg3kF1dTu5YCQr5lwMmq5iR7oWLrDKBk3S BLfcLUG6WQoddNIvHXUahB474TRtGu3MtsvTDaSfd8+2/Rbm4G+cHFH9Ubn/GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1651662055; 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=ngWg/cypzKRH01l8DmTg8HvbHs4x+sT93he0r5jI/go=; b=l49e1FpqGdwtd5OaC4pMeYudmEU5ACcrO9mmm1tINYNirXsTuQWyItq82h8GkbxuBmt9bD PcUXMxDF9s97ugTLV6Q+feEbhFn3zHPhn1Dyu/brvQSws4GJc0bNKz606hV6eSyu+g8QCx rij1yziLHt4QLN22xCMbsxrkR93AZR+zlyJJDR+eqJXU9ZgUMoVwEG1lUYy4Ra/DU0GOFj nA0RYOvWm4KjVlDBaZ3TpExomAnI0eseIHgB3S5vMa7SGFmjx+StPGyx5WsLARygFSJvdG DGwKz1kApVeXOvEhZm3XAvKScQ4K7gBbM1i58sxOm/Smvtpph41J01j9mGm4mw== ARC-Authentication-Results: i=1; rspamd-fdd564cbf-fx9lh; 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-Belong-Invention: 3f4d67023200c867_1651662056299_3110677610 X-MC-Loop-Signature: 1651662056299:3872429733 X-MC-Ingress-Time: 1651662056299 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.96.96.26 (trex/6.7.1); Wed, 04 May 2022 11:00:56 +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 4KtYlk6r08z36; Wed, 4 May 2022 04:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1651662054; bh=ngWg/cypzKRH01l8DmTg8HvbHs4x+sT93he0r5jI/go=; h=Date:Subject:To:Cc:From:Content-Type:Content-Transfer-Encoding; b=A0srkoN8o0jlSHpjifPoCCNWAgbeNLKoVGDyWVyqrlSIoTVU+xFgYeJ8Ke8Ybgfu1 A8jZroqnaF5gOu4QJ/NTcGeqFa4h1qMTQssl7Dkv9X+JJIRWyG6vs+qPO90p6GdAOR rVBinf1xTD7ggElNVeia9mXEjpqza1FTai3hz81yYTUUUCMB8QUlR/NJFsrzlKsWcF mujDYzW+aUcJ+KhnuSCQ1gxMPLzQfJai2MWFd6VcZKHT7EIv6eLkAb2VF3ocacSjQ5 3xvWo50dKewRkhFZY/ghDKBh65wILEvo9X+SHT8izdD3Gudd4P7oCoq90mF91dfC9/ UCicd8hejoC4Q== Message-ID: Date: Wed, 4 May 2022 16:30:46 +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 3/4] clock_adjtime: 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-4-nixiaoming@huawei.com> From: Siddhesh Poyarekar In-Reply-To: <20220428122529.108208-4-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 11:01:02 -0000 On 28/04/2022 17:55, Xiaoming Ni via Libc-alpha wrote: > clock_adjtime()/clock_adjtime64() > 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 > --- LGTM. Reviewed-by: Siddhesh Poyarekar > sysdeps/unix/sysv/linux/bits/time.h | 4 ++-- > sysdeps/unix/sysv/linux/include/sys/timex.h | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h > index efb4a014df..0485a1e181 100644 > --- a/sysdeps/unix/sysv/linux/bits/time.h > +++ b/sysdeps/unix/sysv/linux/bits/time.h > @@ -75,13 +75,13 @@ extern long int __sysconf (int); > __BEGIN_DECLS > > /* Tune a POSIX clock. */ > -extern int clock_adjtime (__clockid_t __clock_id, struct timex *__utx) __THROW; > +extern int clock_adjtime (__clockid_t __clock_id, struct timex *__utx) __THROW __nonnull((2)); > > #ifdef __USE_TIME_BITS64 > # if defined(__REDIRECT_NTH) > extern int __REDIRECT_NTH (clock_adjtime, (__clockid_t __clock_id, > struct timex *__utx), > - __clock_adjtime64); > + __clock_adjtime64) __nonnull((2)); > # else > # define clock_adjtime __clock_adjtime64 > # endif > diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h > index 9d0da60640..0c0261a06d 100644 > --- a/sysdeps/unix/sysv/linux/include/sys/timex.h > +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h > @@ -77,7 +77,7 @@ struct __timex64 > int :32; > int :32; > }; > -extern int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64); > +extern int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) __nonnull((2)); > libc_hidden_proto (__clock_adjtime64); > extern int ___adjtimex64 (struct __timex64 *tx64) __nonnull ((1)); > libc_hidden_proto (___adjtimex64)